Full and partial feedback fix