Re #377 Modifying encoding.