Fixed problem with dashes in filename