mapping bugfixes