Fix to allow spaces in paths