Fixing the dependency list