Fix team counting