Fixed hang in Executor