Fix for missing team_join