AI-684 fixed recursive check of command mutating