It's such a disappointing bug! I'm sure this will get fixed at some point but we decided to flatten our model and proceed.