more protection against spaces in directory names