fixed matching of commands type