Dependency inversion fix