more s3 fix