fix join problem