[B-1] Fixing encodings