fix interruption issues