fix the join q