Bug fix for returnFolderNameAndFolderPath