コマンド改修 - operated by @sekiyaeiji)