fixing bug related to feedbacks