Fixed bug on previous commit