try to improve unicode support