Hotfix for Join phase bug

Reorder, and removal of equals