Bug with spaces in temp path fixed - part 2