feedback handler bug fix.