Fix S3 server issue