Fixing issue when deleting the disambiguated org