lifecycle migration fix