Modified join handling. More compatibility for stupids