okay, this time I *really* fixed it

and really wrote a test to catch the problem.

bleh. I try to do a good job with git branches, but not
yet there