More bad identitiy fixing