fix bug from client