Next match date fix