Added hack to support utf-8 chars