Improve the support of spaces in the file-path