Fix s3 solution
Merges