Fixed bug with identity matching.