Fixed team assignment ( or did I ? )