I will take a look at it and see if I can give you a fix. If you can post your test as you're running it (with some test data that shows the error), I'll be glad to include that as a new test for the module (and it will make it easier for me to deliver a fix that matches exactly your use case).