Added fix for long hyphen in filename