Another fix for migration