Fix feedback from client