Merge "Fix error when using -p"