fixing S3 integration