1.7 migration fix