fix Endpoint and Client