True. I will adjust my patch to inject the context directly.