Fixed the client