Corrected MatchManager