diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 4cfcc9d937..fc58f34219 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -158,7 +158,13 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:	wx
 
-wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+# TODO: put the setup.h under lib
+setuph:
+     cd $(WXDIR)\include\wx\msw
+     if not exist setup.h copy setup0.h setup.h
+     cd $(WXDIR)\src\msw
 
 all:	wx
 
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index e8c47429f2..1c268e7c97 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -370,6 +370,7 @@ bool wxHashTable::Create(int the_key_type, int size)
 void wxHashTable::DoCopy(const wxHashTable& table)
 {
   n = table.n;
+  m_count = table.m_count;
   current_position = table.current_position;
   current_node = NULL; // doesn't matter - Next() will reconstruct it
   key_type = table.key_type;