fixed join issue