Fixed extracting the file names