MID-1770 fix.