Hotfix for Join phase bug