Corrected Interrupt handling