Fix v3 migration
6.0.2