Fixed to work with latest aws-sdk