Fixed the Client class