Fix a mapping problem