Hotfix for migration