Attempt at S3 fix