Make the S3 fix less specific.