MDL-21704 fixed recent regression