Fix mapping of customdata