Fix the identity class problem.