Another validation fix attempt (nw)