fixed with feedback