fix poor mapping of s3 files