fixed identity bug