fix hatch handler