Fix issue with spaces in path