Modified join handling. More compatibility for stupids

commit from netherfoam