Fixed join through logic