Fixed compatibility with latest Harts version