s3 fix again