Fixed bug from last time