make agent persistence cei friendly.