fixed all problem in client