Added handling of self dependencies
Dependence -> Dependency