Next match fix