MID-1780 fix.