Minor fix to allow directories to contain spaces