Headers encoding fix