DAET: fix more logic