fix auto join bug