updates related to encoding fix