feedback from client fix bug