Interruption bug fix