Fix bug when match is started