some validation fix (nw)