Bug fix for rendering in true UTF-8