Fix for BLA issues with HasFieldsEqualThose