Fixed match getting repeatedly overridden