Fix bug with last commit