solve some bugs into the client