diff --git a/src/tmltranslator/touppaal/TML2UPPAAL.java b/src/tmltranslator/touppaal/TML2UPPAAL.java
index e73b550c573f775e11585715c28b0e48d05fff58..e30ec5aac36f71c445cb018f80937269cc2d1fbd 100755
--- a/src/tmltranslator/touppaal/TML2UPPAAL.java
+++ b/src/tmltranslator/touppaal/TML2UPPAAL.java
@@ -79,7 +79,7 @@ public class TML2UPPAAL {
     public final static int GUARD_X = 0;
     public final static int GUARD_Y = -20;
 
-    public static final int DEFAULT_INFINITE_FIFO_SIZE = 1024;
+    public static final int DEFAULT_INFINITE_FIFO_SIZE = 8;
 
 
     public TML2UPPAAL(TMLModeling _tmlmodeling) {
diff --git a/src/ui/window/JDialogUPPAALValidation.java b/src/ui/window/JDialogUPPAALValidation.java
index d9b272999f92a5b5cc1e344a28428f4810dfe144..6e052f2546ce5a7c20db13b409f9d4cb228f15e8 100755
--- a/src/ui/window/JDialogUPPAALValidation.java
+++ b/src/ui/window/JDialogUPPAALValidation.java
@@ -356,13 +356,22 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
 
     public void startProcess() {
 	// hack spec if necessary.
+	
 	if (hasFiniteSize) {
-	    int index = spec.indexOf("DEFAULT_INFINITE_SIZE");
-	    String specEnd = spec.substring(index+24, spec.length());
-	    String specbeg = spec.substring(0, index+24);
-	    specbeg += sizeOfInfiniteFIFO.getText();
-	    specEnd = specEnd.substring(specEnd.indexOf(";"), specEnd.length());
-	    spec = specbeg + specEnd;
+	    try {
+                int sizeDef = Integer.decode(sizeOfInfiniteFIFO.getText()).intValue();
+		int index = spec.indexOf("DEFAULT_INFINITE_SIZE");
+		String specEnd = spec.substring(index+24, spec.length());
+		String specbeg = spec.substring(0, index+24);
+		specbeg += sizeDef;
+		specEnd = specEnd.substring(specEnd.indexOf(";"), specEnd.length());
+		spec = specbeg + specEnd;
+            } catch (Exception e) {
+                jta.append("Non valid size for infinite FIFO");
+                jta.append("Using default size");
+                
+            }
+
 	    //TraceManager.addDev("spec=" + spec);
 	}