DME fix 2: fix more.