Fixing dependancy graph