Fixed bug from previous commit