Possible fix for S3 issue