Fixed identity reset to default in case identity is set in track!