Minor fix to handle spaces in path