diff --git a/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java b/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
index 47ec1f6..1064552 100644
--- a/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
+++ b/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
@@ -95,7 +95,7 @@ private String handleIncomingMessage(int id, String message) {
 				newJson = deserializeJsonAndAnnotate(message);	    				
 	    	}
 	    	else if (message.startsWith("Json2DFD:")) {
-	    		message = message.replaceFirst("Json2DFD:", "");   		
+	    		message = message.replaceFirst("Json2DFD:" + name + ":", "");   		
 				var webEditorDfd = deserializeJson(message);
 			    return name + ":" + Converter.convertToDFDandStringify(webEditorDfd, name);	
 	    	}