fix last commit bugs