diff --git a/src/org/ntlab/deltaViewer/CollaborationObjectCallGraph.java b/src/org/ntlab/deltaViewer/CollaborationObjectCallGraph.java
index 64379ee..6f0b59d 100644
--- a/src/org/ntlab/deltaViewer/CollaborationObjectCallGraph.java
+++ b/src/org/ntlab/deltaViewer/CollaborationObjectCallGraph.java
@@ -175,15 +175,8 @@
 			String srcClassName = ref.getSrcClassName();
 			String srcObjId = ref.getSrcObjectId();
 			boolean isFirstRef = true;
-			int idx = 0;
-			int cnt = 0;
-			// Count "$" in srcClassName and don't shrink References too much(JHotDrawTransform).
-			while(true) {
-			    idx = srcClassName.indexOf("$", idx) + 1;
-			    if (idx == 0) break;
-			    cnt++;
-			}
-			if (cnt != 1) {
+			// If dstClassName matches "$[1-9]" and don't shrink References too much(JHotDrawTransform).
+			if (!ref.getDstClassName().matches(".*\\$[0-9]+.*")) {
 				for (int j = 0; j < collectionReferences.size(); j++) {
 					if (collectionReferences.indexOf(ref) != j) {
 						Reference compareRef = collectionReferences.get(j);
diff --git a/src/org/ntlab/deltaViewer/MagnetRONViewer.java b/src/org/ntlab/deltaViewer/MagnetRONViewer.java
index 2c28c86..597bbea 100644
--- a/src/org/ntlab/deltaViewer/MagnetRONViewer.java
+++ b/src/org/ntlab/deltaViewer/MagnetRONViewer.java
@@ -372,6 +372,7 @@
 				sourceCell.getParent().remove(sourceCell);
 			}
 
+			mxgraph.orderCells(true, new Object[] {sourceCell});
 			sourceCell.setParent(targetCell.getParent());
 			targetCell.getParent().insert(sourceCell);
 			System.out.println("moveLocalObjectVertex: " + sourceCell.getId() + " (" + sourceCell.hashCode() + ")" + ", " + sourceCell.getParent().getId() + " (" + sourceCell.getParent().hashCode() + ")");
@@ -449,6 +450,7 @@
 			}
 
 			if (!isParent(targetCell, sourceCell)) {
+				mxgraph.orderCells(true, new Object[] {sourceCell});
 				sourceCell.setParent(targetCell.getParent());
 				targetCell.getParent().insert(sourceCell);
 				Point absolutePointSourceParentCell = getAbsolutePointforCell(sourceCell.getParent());