Issue #62: tweak interrupt handler reset logic