Yet another fix to the migration