MID-1999 fix