MID-1987 fix