Fix in HWT code.