fix some join bug