Fixed support of filenames with spaces