Fixed a bug in the mappings