Removed fixClientData()