Fixed a mapping problem