fix for MID-2110