Pull req fix hsm/2.9