fix join definition