Workarround the s3-wagon issue