Fix calculateWinner