--- a/ooDialog/trunk/ooDialog/oodControl.cpp
+++ b/ooDialog/trunk/ooDialog/oodControl.cpp
@@ -2393,7 +2393,7 @@
         goto done_out;
     }
 
-    result = createControlFromHwnd(context, pcdc, hTT, ctrlType, false);
+    result = createControlFromHwnd(context, pcdc, hTT, winToolTip, false);
     protectControlObject(context, pcdc, result);
 
 done_out:
@@ -2429,7 +2429,7 @@
     HWND         hOldTT   = NULL;
 
     // Rather than put the tool tip object in the dialog bag, we put it in this
-    // tree-view's bag.
+    // control's bag, list-view or tree-view.
     pCDialogControl pcdcTT = controlToCSelf(context, toolTip);
     protectControlObject(context, pcdc, toolTip);