new encoding fix