HWP validation fix