legacy migration fix