Fix for S3 Storage issue