Fix for IDENTITY-2914