Fix for #902: Interrupt than work