Fix the dependency injection