Fix match bugs when no capture