fix more indices issues