fixed unicode support issue