Fix for spaces in paths 2