Fixed feedback bugs