hmm... thanks @crumblycake for pointing out that the current logic is not quite correct. @crumblycake - did you want to put up a PR with a fix (including the fixup in the test logic as well)? If not, I can put one up in a bit.