fix unicode support