Confirm bug and that MattRead's diff fixes things. I couldn't get it to apply against latest svn for some reason, so here's a rougly equivalent patch (read: does the same things) that should apply fine.