Fixing the client