Make the previous fix more correct.