fix more bugs with mapper