fixed the unicode support