Fix for migration issue