Fix a bug in case of folders with space in its name