fix for IDENTITY-2056