Fixing issue with filenames