Fix up Mr_okushama's PR.