s3 fix take two