Fix for filenames with special chars