MID-2007 fix.