[Back] Fix encoding bug