Fix bug related to folder name with space