Fix for spaces in filenames