diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index bb7b73900506539b274eec6465402e2a0deaab05..a9bccd6cfe65f6250376d34a0169f792d8cbaee1 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -1002,7 +1002,7 @@ class Dumper:
             if len(watchers) > 0:
                 for watcher in watchers.split("##"):
                     (exp, iname) = watcher.split("#")
-                    handleWatch(self, exp, iname)
+                    self.handleWatch(exp, iname)
 
         #
         # Breakpoints
@@ -1032,7 +1032,7 @@ class Dumper:
                     with Children(self, len(list)):
                         itemNumber = 0
                         for item in list:
-                            handleWatch(self, item, "%s.%d" % (iname, itemNumber))
+                            self.handleWatch(item, "%s.%d" % (iname, itemNumber))
                             itemNumber += 1
                 except RuntimeError, error:
                     warn("EVAL: ERROR CAUGHT %s" % error)
@@ -1043,7 +1043,7 @@ class Dumper:
                         pass
             return
 
-        with SubItem(d):
+        with SubItem(self):
             self.putField("iname", iname)
             self.putField("name", escapedExp)
             self.putField("exp", escapedExp)