Further encoding fix