DEV-23692 fix2