MID-2060 fix.