Change to make sure the context is propagate to the promise resolution logic