Fix command matching

Compatibility with multi-argument commands is crucial