Bug fixing last commit