Better handling of interrupts