Bugfix by Kenich Shirakawa