trying to fix after s3