[Issue #88] Fixing teams once and for all