* Mapping bugs fixed