diff --git a/src/main/java/de/tla2b/config/ConfigfileEvaluator.java b/src/main/java/de/tla2b/config/ConfigfileEvaluator.java
index 22f6dbdbc91615541e1c583aaedb776b48db2c39..511200457754a0e6ba2a638e9896983b30e41f13 100644
--- a/src/main/java/de/tla2b/config/ConfigfileEvaluator.java
+++ b/src/main/java/de/tla2b/config/ConfigfileEvaluator.java
@@ -166,7 +166,7 @@ public class ConfigfileEvaluator {
 			TLAType symbolType = conGetType(symbol.lastElement());
 			if (constants.containsKey(symbolName)) {
 				OpDeclNode c = constants.get(symbolName);
-				constantAssignments.put(c, new TLCValueNode(symbolValue, symbolType, null));
+				constantAssignments.put(c, new TLCValueNode(symbolValue, symbolType, c.getTreeNode()));
 				// if conValue is a model value and the name of the value is the
 				// same as the name of constants, then the constant declaration
 				// in the resulting B machine disappears
diff --git a/src/main/java/de/tla2b/config/ModuleOverrider.java b/src/main/java/de/tla2b/config/ModuleOverrider.java
index e7e9cbe5e46a0221b6a1ae3ed0370c9ab50e112d..3318f4a7ac6f53e525d47a3f978c21b3c383a0fb 100644
--- a/src/main/java/de/tla2b/config/ModuleOverrider.java
+++ b/src/main/java/de/tla2b/config/ModuleOverrider.java
@@ -71,7 +71,7 @@ public class ModuleOverrider extends BuiltInOPs {
 			case LetInKind: {
 				LetInNode l = (LetInNode) n;
 				for (OpDefNode let : l.getLets()) {
-					visitExprOrOpArgNode(let.getBody());
+					visitExprNode(let.getBody());
 				}
 
 				OpApplNode res = visitExprNode(l.getBody());