Fixed Dependency Injection issue