validation fix in main trunk (nw)