fixed unicode handling