Another fix for tricky tex<->utf8 cases