Fixed identity check