Fix Mapping

See #1