Fix bug last commit