Migration hotfix