fix bugs in feedback