reflected changes related to #117 of japanese version #111