Fix table join