patch #591230 from Toshiharu Moriyama