This was partially fixed by 57fdb2b0, back in 2005, but it missed a couple of spots. YAMAMOTO Takashi