Dependency graphs fix