add -p: fix 2.17.0-rc* regression due to moved code