Added code to prevent endless unlooping of the schema-graph.