This was correct before, not sure how we convinced ourselves otherwise. I added additional verification checks to the tests.