Resolve issue when there is a space in the folder names