Issue #107: Interrupt handling