added missing support for unicode