Right before changing things in the mapper