Fix HttpClient