fix bugs about last commit