fix where executor service doesn't close when context does
3 files changed