And the encoding fix