Some fix in the check of n.d.