I think this should fix the issue with files containing special characters