diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java
index 8afe663..7abe2f2 100644
--- a/src/main/java/org/umlgraph/doclet/ClassGraph.java
+++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java
@@ -661,7 +661,7 @@ class ClassGraph {
 	w.println("\t// " + fromName + " " + rt.toString() + " " + toName);
 	w.println("\t" + relationNode(from, fromName) + " -> " + relationNode(to, toName) + " [" +
     	"taillabel=\"" + tailLabel + "\", " +
-    	"label=\"" + guillemize(opt, label) + "\", " +
+    	((label == null || label.isEmpty()) ? "label=\" \"" : "label=\"" + guillemize(opt, label) + "\", ") +
     	"headlabel=\"" + headLabel + "\", " +
     	"fontname=\"" + opt.edgeFontName + "\", " +
     	"fontcolor=\"" + opt.edgeFontColor + "\", " +
@@ -841,8 +841,12 @@ class ClassGraph {
 	    if (hidden(fri.cd))
 		continue;
 
-	    String destAdornment = fri.multiple ? "*" : "";
-	    relation(opt, opt.inferRelationshipType, c, fri.cd, "", "", destAdornment);
+	    // if source and dest are not already linked, add a dependency
+	    RelationPattern rp = getClassInfo(c.toString()).getRelation(fri.cd.toString());
+	    if (rp == null) {
+		String destAdornment = fri.multiple ? "*" : "";
+		relation(opt, opt.inferRelationshipType, c, fri.cd, "", "", destAdornment);
+            }
 	}
     }
 
diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java
index d8c5bed..ce9e098 100644
--- a/src/main/java/org/umlgraph/doclet/Version.java
+++ b/src/main/java/org/umlgraph/doclet/Version.java
@@ -1,4 +1,4 @@
 /* Automatically generated file */
 package org.umlgraph.doclet;
-class Version { public static String VERSION = "R5_6_6-1-g9240c4";}
+class Version { public static String VERSION = "R5_6_6-8-g8d7759";}
 	
\ No newline at end of file