Fixed team join