Support spaces in file name