Bugfix: Tweak the DependencyResolver