fix bug
fix bug and typo