Further adjust encoding