Bug fix for filenames, again