ExecutionContext bug fix