--- a/DebugClients/Python/DebugClientBase.py	Sun Jul 24 21:34:54 2016 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Wed Aug 03 21:41:40 2016 +0200
@@ -522,7 +522,8 @@
                 
                 # clear all old breakpoints, they'll get set after we have
                 # started
-                self.mainThread.clear_all_breaks()
+                Breakpoint.clear_all_breaks()
+                Watch.clear_all_watches()
                 
                 self.mainThread.tracePythonLibs(int(tracePython))