Fix handling of utf-8 chars