fix join stuff