diff --git a/src/helma/scripting/fesi/ESMapWrapper.java b/src/helma/scripting/fesi/ESMapWrapper.java
index 8ca6b44f..f52dd3ff 100644
--- a/src/helma/scripting/fesi/ESMapWrapper.java
+++ b/src/helma/scripting/fesi/ESMapWrapper.java
@@ -64,7 +64,8 @@ public class ESMapWrapper extends ESWrapper {
 	    return new ESString ((String) val);
 	else if (val instanceof INode)
 	    return reval.getNodeWrapper ((INode) val);
-
+	else if (val instanceof ESValue)
+	    return (ESValue) val;
 	return ESLoader.normalizeValue(val, evaluator);
     }