fixed join handling