Fixed S3 issue