One more encoding fix attempt