better fix for MID-1511