Fixed bug from my previous commit