diff --git a/src/helma/scripting/rhino/RhinoCore.java b/src/helma/scripting/rhino/RhinoCore.java
index b1ffdd7d..fc280c14 100644
--- a/src/helma/scripting/rhino/RhinoCore.java
+++ b/src/helma/scripting/rhino/RhinoCore.java
@@ -752,14 +752,14 @@ public final class RhinoCore {
                 return getNodeWrapper((INode) obj);
             }
 
-            if (obj != null && app.getPrototypeName(obj) != null) {
-                return getElementWrapper(obj);
-            }
-
             if (obj instanceof SystemMap || obj instanceof WrappedMap) {
                 return new MapWrapper((Map) obj, RhinoCore.this);
             }
 
+            if (obj != null && app.getPrototypeName(obj) != null) {
+                return getElementWrapper(obj);
+            }
+
             if (obj instanceof String) {
                 return obj;
             }
@@ -767,14 +767,6 @@ public final class RhinoCore {
             return super.wrap(cx, scope, obj, staticType);
         }
 
-        public Scriptable wrapAsJavaObject(Context cx, Scriptable scope, Object javaObject) {
-            if (javaObject != null && app.getPrototypeName(javaObject) != null) {
-                return getElementWrapper(javaObject);
-            }
-
-            return super.wrapAsJavaObject(cx, scope, javaObject);
-        }
-
         public Scriptable wrapNewObject(Context cx, Scriptable scope, Object obj) {
             // System.err.println ("N-Wrapping: "+obj);
             if (obj instanceof INode) {