More encoding fix