Fix ExecutionContext overridability