Attempted fix for Amazon S3