MDL-21781 fixed case