Improve HA, see issue 45