fix more mapping