fixed join issue
fixed join issue