MID-1806 - fix.