MID-2012 fix