fix the bugs of last commit