diff --git a/modeling/testModelCheckerAvatar/testClocks.xml b/modeling/testModelCheckerAvatar/testClocks.xml
index f4c30bcc764ad4113c4a2f81a4f4241dab118509..c0b63c4e187ee06696e8089b9fb5e943232dfabd 100644
--- a/modeling/testModelCheckerAvatar/testClocks.xml
+++ b/modeling/testModelCheckerAvatar/testClocks.xml
@@ -7,7 +7,7 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="" />
+<Validated value="B3;B2;B1;" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="2" >
@@ -551,8 +551,6 @@
 <afterMax value="30" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
diff --git a/src/avatartranslator/modelchecker/AvatarModelChecker.java b/src/avatartranslator/modelchecker/AvatarModelChecker.java
index 50bd1d30caba0fe7af95904ce844fe9243d5816d..57b40909b6f9083b398fb34229b39b5673019986 100644
--- a/src/avatartranslator/modelchecker/AvatarModelChecker.java
+++ b/src/avatartranslator/modelchecker/AvatarModelChecker.java
@@ -652,17 +652,17 @@ public class AvatarModelChecker implements Runnable, myutil.Graph {
         // Must compute the clockmin and clockmax values
         String minDelay = _at.getMinDelay().trim();
         if ((minDelay == null) || (minDelay.length() == 0)) {
-            st.clockMin = 0 - _sb.values[SpecificationBlock.CLOCKMIN_INDEX];
+            st.clockMin = 0 - _sb.values[SpecificationBlock.CLOCKMAX_INDEX];
         } else {
-            st.clockMin = evaluateIntExpression(_at.getMinDelay(), _block, _sb) - _sb.values[SpecificationBlock.CLOCKMIN_INDEX];
+            st.clockMin = evaluateIntExpression(_at.getMinDelay(), _block, _sb) - _sb.values[SpecificationBlock.CLOCKMAX_INDEX];
         }
         String maxDelay = _at.getMaxDelay().trim();
         if ((maxDelay == null) || (maxDelay.length() == 0)) {
-            st.clockMax = 0 - _sb.values[SpecificationBlock.CLOCKMAX_INDEX];
+            st.clockMax = 0 - _sb.values[SpecificationBlock.CLOCKMIN_INDEX];
         } else {
             int resMax = evaluateIntExpression(_at.getMaxDelay(), _block, _sb);
             _sb.maxClock = Math.max(_sb.maxClock, resMax);
-            st.clockMax = resMax - _sb.values[SpecificationBlock.CLOCKMAX_INDEX];
+            st.clockMax = resMax - _sb.values[SpecificationBlock.CLOCKMIN_INDEX];
         }
 
 	if (st.clockMin > st.clockMax) {