Fixing bug related to last commit