team-building-opt-fix