Fix join issue when using collapsing