CurlHttpClient hot fix. Waiting for a good solution from Nikita K.