fix for CHAIR-1095, due to haystack issues 957 and 998