bug fixed: Dependency Injection