Hotfix for Unicode strings