diff --git a/src/org/ntlab/deltaViewer/MagnetRONViewer.java b/src/org/ntlab/deltaViewer/MagnetRONViewer.java
index a7925bc..560da96 100644
--- a/src/org/ntlab/deltaViewer/MagnetRONViewer.java
+++ b/src/org/ntlab/deltaViewer/MagnetRONViewer.java
@@ -724,6 +724,8 @@
 		double srcCellCoordX = srcCell.getGeometry().getX();
 		double srcCellCoordY = srcCell.getGeometry().getY();
 
+		MagnetRONAnimation.waitAnimationEnd();
+		
 		// Add a vertex to the graph in a transactional fashion. The vertex is actually a 'cell' in jgraphx terminology.
 		mxgraph.getModel().beginUpdate();
 		synchronized (mxgraph.getModel()) {
@@ -985,7 +987,10 @@
 					}
 				}
 			}
-
+			MagnetRONAnimation.waitAnimationEnd();
+			if (alias.getAliasType().equals(AliasType.CONSTRACTOR_INVOCATION)) {
+				sleepMainThread(500L);
+			}
 			removeCalledMethodExecutionVertex(srcObjVertex, methodExec, calledMethodExec);
 		} else {
 			removeMethodExecutionVertex(srcObjVertex, methodExec);