Identity fix