More fix for migration