update for (simple) handling of circular references.