Bugfix when filename contains a comma