Another S3 fix attempt