Fix filename issue for S3 upload