Fix issue with feedback