Fixed to use new version of apache httpclient