Ok, not that we've cleared up the other item. this is still a bug. If you fix this, I'll merge your commit.