Fix team helper