fix some bugs about last commit