Encoding fix on cbs

May fix android issue