Overriding now works, filenames with spaces no work