Fixed issue with underscores '_' in file names