temp patch for new dependency injection issue