Fix for spaces in PWD