Address tyoshino's suggestion.