Trying to make the fix more general than present use case.