Migrate issue fixed