UTF-fix #2