Fixed bug on last commit