Fix problem with command match pattern