For issue #84 https://github.com/aws/aws-sdk-java/issues/84