Mapping and undulation correction