diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 826bfe2cb3..312dee2977 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -837,7 +837,8 @@ static wxString ConvertStringFromOle(BSTR bStr)
 	char    *buf = new char[len];
 	(void)wcstombs( buf, bStr, len);
 
-	wxString str(buf);
+    // FIXME -- use bStr directly in Unicode mode?
+	wxString str(buf, wxConvLibc); 
 	delete[] buf;
 	return str;
 }
diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index a909b3e85e..3c66ba49e0 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -1098,7 +1098,7 @@ protected:
         // CFSTR_SHELLURL is _always_ ANSI!
         wxCharBuffer char_buffer( GetDataSize() );
         wxCustomDataObject::GetDataHere( (void*)char_buffer.data() );
-        wxString unicode_buffer( char_buffer );
+        wxString unicode_buffer( char_buffer, wxConvLibc );
         memcpy( buffer, unicode_buffer.c_str(),
                 ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );