S3 Uploader fix