Fix jointure WTF...