Added extra handling for file names with underscores