Fixed problem with unusual characters in filenames