Heh- I think this was your fix that I inherited by basing this branch on #392.