diff --git a/AlgebraicDataflowArchitectureModel/src/code/ast/MethodInvocation.java b/AlgebraicDataflowArchitectureModel/src/code/ast/MethodInvocation.java
index 5d8a848..17d7358 100644
--- a/AlgebraicDataflowArchitectureModel/src/code/ast/MethodInvocation.java
+++ b/AlgebraicDataflowArchitectureModel/src/code/ast/MethodInvocation.java
@@ -81,27 +81,27 @@
 	
 	@Override
 	public String toString() {
-		if (receiver == null) {
-			StringBuilder builder = new StringBuilder();
-			
-			builder.append(methodName).append("(");
-			
-			if (!arguments.isEmpty()) {
-				for (int i = 0; i < arguments.size(); i++) {
-					Expression argument = arguments.get(i);
-					
-					builder.append(argument.toString());
-					
-					if (i < arguments.size() - 1) {
-						builder.append(", ");
-					}
+		StringBuilder builder = new StringBuilder();
+		if (receiver != null) {
+			builder.append(receiver.toString()).append(".");
+		}
+		
+		builder.append(methodName).append("(");
+		
+		if (arguments != null && !arguments.isEmpty()) {
+			for (int i = 0; i < arguments.size(); i++) {
+				Expression argument = arguments.get(i);
+				
+				builder.append(argument.toString());
+				
+				if (i < arguments.size() - 1) {
+					builder.append(", ");
 				}
 			}
-			
-			builder.append(");");
-			
-			return builder.toString();
 		}
-		return super.toString();
+		
+		builder.append(")");
+		
+		return builder.toString();
 	}
 }