Please check the upstream code. I think I saw a fix for this go by on the list, but don't hold me to that.