Fixed bug with S3.