Fix for spaces in custom filename