Fix join issue when using collapsing
Merge pull request #470 from emmanuel-keller/master

Fix join issue when using collapsing