Draft: Further fix in text encodings