Fix again for migration