diff --git a/NiL.JS/Core/Interop/DictionaryWrapper.cs b/NiL.JS/Core/Interop/DictionaryWrapper.cs
index a59db945c..747825acd 100644
--- a/NiL.JS/Core/Interop/DictionaryWrapper.cs
+++ b/NiL.JS/Core/Interop/DictionaryWrapper.cs
@@ -4,6 +4,12 @@
 
 namespace NiL.JS.Core.Interop
 {
+    public static class DictionaryWrapper
+    {
+        public static DictionaryWrapper<TKey, TValue> Of<TKey, TValue>(IDictionary<TKey, TValue> dictionary)
+            => new DictionaryWrapper<TKey, TValue>(dictionary);
+    }
+
     public sealed class DictionaryWrapper<TKey, TValue> : JSObject
     {
         private readonly IDictionary<TKey, TValue> _target;
diff --git a/NiL.JS/Extensions/JSValueExtensions.cs b/NiL.JS/Extensions/JSValueExtensions.cs
index d4b7f5778..8eddb08c7 100644
--- a/NiL.JS/Extensions/JSValueExtensions.cs
+++ b/NiL.JS/Extensions/JSValueExtensions.cs
@@ -176,8 +176,8 @@ public static T GetDefinedOr<T>(this JSValue self, T defaultValue)
                         if (self.Value is Function && typeof(Delegate).IsAssignableFrom(typeof(T)))
                             return ((Function)self.Value).MakeDelegate<T>();
 
-                        if (typeof(T).IsAssignableFrom(self.GetType()))
-                            return (T)(object)self;
+                        if (typeof(T).IsAssignableFrom(self.Value.GetType()))
+                            return (T)self.Value;
 
                         try
                         {