Fixed DependencyResolver