fix the tot len
merge master