Fixed issue with spaces in filename