fix - failsafe data migration