fix all the bugs of the last commit