again use NDB instead of DIBI