Fix mapping reader