kansaiben bugfix
merge conflicts
just to transfer