NH-3234 - Fix inversion of identity-map