Fix filenames with spaces - again

References #102.