fixing bug from merge