Fixed a problem with the S3 helper