apply feedback of Fukami-san to other language version