MOD: fixed encoding (again)