Fix issue with interruptions