fixed unicode handling issue