Fixed the UTF-8 bug once more