add a fix for identity matching

@calvinfo