Fixing issue if migrating from scratch