fix more loop variables #26