fix for MID-1978