Added masking for non-timer interrupts