Fixing bug from last commit