Fix NDD