fix more overlaps