Hotfix: Fixes address migration
Hotfix: Fixes Address Migration