Fixed bug with feedback class