Hwt cancel fix