FIx the issue with amozon S3