fixed auto join