Fixes +p flag behaviour