Add ugly support for UTF-16