S3 fix attempt #6