Fixed DNE issue