Fixing weird team/no team bug