fix encoding issue
Merge branch 'hotfix/encoding_issue'

* hotfix/encoding_issue:
  fix encoding issue