Fixed bug from last commit