Fixed issue with new folder name logic