Trying to fix the dependencyresolver issues