Fix for NumTeams