[ja] follow up #615 , #616
Merge pull request #621 from suzuki/feature/ja-follow-up-615-616

[ja] follow up #615 , #616