Fixed a bug from my previous commit