Fixed join issue