Hotfix for Join phase bug
Merge pull request #378 from Fuzzysqurl/patch-3

Hotfix for Join phase bug