Fix rank difference on re-join