Fixing SubTeam