Fixing dependency graph