update and fix

update and fix