Fix problem with filename with spaces