make fix more robust