Fix issue addressing NO_HAT.