Join-Leave-Join fix