Fix for MatchState acting weird