diff --git a/src/org/ntlab/deltaViewer/CollaborationLayout.java b/src/org/ntlab/deltaViewer/CollaborationLayout.java
index 45ea389..0f5ce73 100644
--- a/src/org/ntlab/deltaViewer/CollaborationLayout.java
+++ b/src/org/ntlab/deltaViewer/CollaborationLayout.java
@@ -27,7 +27,7 @@
 import com.mxgraph.util.mxPoint;
 
 public class CollaborationLayout implements IObjectLayout {
-	private static final int angleStep = 15;
+	private static final int angleStep = 30;
 	private mxPoint coordinatorPoint = new mxPoint(0, 100);
 	private double step;
 	private double padding;		
@@ -114,7 +114,12 @@
 					String dstObjId = methodExec.getReturnValue().getId();
 					String srcClassName = methodExec.getThisClassName();
 					String dstClassName = methodExec.getReturnValue().getActualType();
-					idx = references.indexOf(new Reference(srcObjId, dstObjId, srcClassName, dstClassName));
+					Reference r = new Reference(srcObjId, dstObjId, srcClassName, dstClassName);
+					idx = references.indexOf(r);
+					if (idx < 0) {
+						references.add(r);
+						idx = references.indexOf(r);
+					}
 				}
 			} else if (a.getAliasType() == AliasType.CONSTRACTOR_INVOCATION) {
 				MethodInvocation c = (MethodInvocation) a.getOccurrencePoint().getStatement();