Interrupt fix