Sorry, I see the problem now. Thanks for your patient and clear explanation. I'll code up a fix with test coverage.