fix bugs on last commit