Fix multi-dependency resolution