Upgrade to hh 6.0.0.pre7