FIX regression in CommandEdit and CommandSetEdit