Bug fix for Amazon S3