NextMatch table should now be updated correctly.