One more encoding bug fixed