fixed unicode support