Fixed join conditions