Fix issue with filenames containing underscore