be consistent with the way mappings are handled