Bugfix - underscore character in filename couses an exeption.