Fix join issue