refine feedback handling fixes #5