Fix join org bug. Thanks to Jasdeep Bhumber.