fix join bug 1