Disable and enable match mode control appropriately