another hacky attempt to fix s3 issues