Fix unicode support