Fixed bug introduced on last commit