fix for local mode interruption problems
2 files changed