Start to fix encoding bug