diff --git a/src/main/jastadd/base/Navigation.jrag b/src/main/jastadd/base/Navigation.jrag
index 92e53ae03b4393d60cf9069776a4a60c3fc0036b..5f2cd9ea4d7ce36b076419000b23c809254d3644 100644
--- a/src/main/jastadd/base/Navigation.jrag
+++ b/src/main/jastadd/base/Navigation.jrag
@@ -165,8 +165,12 @@ aspect Navigation {
     to PetriNet.allDinerosTransitions()
     for petriNet();
 
+  coll java.util.Set<DinerosPlace> PetriNet.allDinerosPlaces() [new java.util.HashSet()] root PetriNet;
+  DinerosPlace contributes this
+     to PetriNet.allDinerosPlaces()
+     for petriNet();
 
-        coll java.util.Set<Arc> PetriNet.allArcs() [new java.util.HashSet()] root PetriNet;
+  coll java.util.Set<Arc> PetriNet.allArcs() [new java.util.HashSet()] root PetriNet;
   Arc contributes this
     to PetriNet.allArcs()
     for petriNet();
diff --git a/src/main/jastadd/base/export/ComplexElementsConverter.jadd b/src/main/jastadd/base/export/ComplexElementsConverter.jadd
index 168001cbb09db684f08a6cad8811d5445349bd9a..cda4abf7c2fdf0e0478691d055f5c88056882064 100644
--- a/src/main/jastadd/base/export/ComplexElementsConverter.jadd
+++ b/src/main/jastadd/base/export/ComplexElementsConverter.jadd
@@ -14,6 +14,8 @@ aspect ComplexElementsConverter{
 
         private static StringBuffer clipToolSpecificsFormattedXmlBuffer(String toolName, String toolVersion, StringBuffer formattedXmlBuffer) {
 
+            System.out.println("Clipping: " + formattedXmlBuffer);
+
             if (formattedXmlBuffer != null) {
 
                 int endCharsLength = 15;
@@ -27,7 +29,8 @@ aspect ComplexElementsConverter{
                     indexGt = formattedXmlBuffer.indexOf(">");
                 }
 
-                if (toolNameLenth > 0 || toolVersionLength > 0) {
+                if ((toolNameLenth > 0 || toolVersionLength > 0)
+                        && formattedXmlBuffer.toString().contains("tool=\"" + toolName + "\"")) {
                     formattedXmlBuffer.delete(0, indexGt + 1);
                     formattedXmlBuffer.delete(formattedXmlBuffer.length() - endCharsLength, formattedXmlBuffer.length());
                 }