Fixed join parsing