Additional fix for spaces in filenames