Add support for output file names with spaces too