one more fix for MID-1924