Fix for migration