Hotfix encoding problem