TeamService - Fix