Feedback from client fixed