hwp validation fix (bz685046) rev1