Filenames issue fixed