Fix in client