Fix rematch process