Take spaces in folder names into account