fix more broadcasting cases