fix with feedback