Fixing dependency tree