some fix and nod deletenull