diff --git a/prism/src/parser/ast/ModulesFile.java b/prism/src/parser/ast/ModulesFile.java
index 3048a8d6..e729183a 100644
--- a/prism/src/parser/ast/ModulesFile.java
+++ b/prism/src/parser/ast/ModulesFile.java
@@ -408,6 +408,9 @@ public class ModulesFile extends ASTElement
 		formulaIdents.clear();
 		constantIdents.clear();
 		varIdents.clear();
+		varDecls.clear();
+		varNames.clear();
+		varTypes.clear();
 		
 		// Expansion of formulas and renaming
 
diff --git a/prism/src/parser/visitor/FindAllVars.java b/prism/src/parser/visitor/FindAllVars.java
index 54064745..00af7b35 100644
--- a/prism/src/parser/visitor/FindAllVars.java
+++ b/prism/src/parser/visitor/FindAllVars.java
@@ -61,6 +61,7 @@ public class FindAllVars extends ASTTraverseModify
 				throw new PrismLangException(s, e.getVarIdent(i));
 			}
 			// Store the type
+			System.out.println("Setting "+i+" of " +e+ " to "+varTypes.elementAt(j));
 			e.setType(i, varTypes.elementAt(j));
 			// And store the variable index
 			e.setVarIndex(i, j);