fixed bugs of last commit