bug fix: using BVA workaround, there are less splits required.