bug fix last commit