diff --git a/src/avatartranslator/modelchecker/AvatarModelChecker.java b/src/avatartranslator/modelchecker/AvatarModelChecker.java
index dbb7ff977307b9820dcd9eb6262988ac8db937b0..eef755864db5ed1883fd66e320e7d3d79df51532 100644
--- a/src/avatartranslator/modelchecker/AvatarModelChecker.java
+++ b/src/avatartranslator/modelchecker/AvatarModelChecker.java
@@ -147,12 +147,12 @@ public class AvatarModelChecker implements Runnable {
         // Compute initial state
         SpecificationState initialState = new SpecificationState();
         initialState.setInit(spec);
-	prepareTransitionsOfState(initialState);
-        blockValues = initialState.getBlockValues();
         initialState.id = getStateID();
 	if (ignoreEmptyTransitions) {
 	    handleNonEmptyUniqueTransition(initialState);
 	}
+	prepareTransitionsOfState(initialState);
+	blockValues = initialState.getBlockValues();
 	
         //TraceManager.addDev("initialState=" + initialState.toString());
 	initialState.computeHash(blockValues);