Fix of Team Assignments