Hopefully fix HH build