Bug fix - error occurs when new folder name has space