fix join