fix(InjectContext) Address one more issue from refactor