Fix issue with whitespaces in folder names