edit missed merge
Merge kinouchi_fix