Node state retention fix