Fix CommandMatch input processing