Fix team switching