Patch to proper unicode strings handling