Fix to mappings