S3 fix... hopefully