Your sample is exactly the test I have based on your suggestion for reproducing above. So I am going to close this one as resolved since it is working for me locally after my changes.