Fixing S3 issue