Fixed bug with filenames