UTF-8 bug fixed