fix unicode strings handling