Hotfix conversion