diff --git a/test/scripts/typedvar.py b/test/scripts/typedvar.py
index 103d3e5..53437a5 100644
--- a/test/scripts/typedvar.py
+++ b/test/scripts/typedvar.py
@@ -250,3 +250,8 @@ class TypedVarTest( unittest.TestCase ):
         tv = pykd.typedVar( "g_virtChild" )
         print tv
         self.assertEqual( -100, tv.m_baseField )
+    
+    def testDinkumwareMap(self):
+        g_map = target.module.typedVar( "g_map" )
+        self.assertEqual( 1, g_map._Mysize )
+    
diff --git a/test/targetapp/targetapp.cpp b/test/targetapp/targetapp.cpp
index 60a10fd..ee92d37 100644
--- a/test/targetapp/targetapp.cpp
+++ b/test/targetapp/targetapp.cpp
@@ -551,10 +551,16 @@ int doExeptions()
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <map>
+
+std::map<int, bool> g_map;
+
 int _tmain(int argc, _TCHAR* argv[])
 {
     try
     {
+        g_map.insert(std::pair<int, bool>(100, true));
+
         InitializeListHead( &g_listHead );
         InsertTailList( &g_listHead, &g_listItem1.listEntry );
         InsertTailList( &g_listHead, &g_listItem2.listEntry );