more robust feedback handling