diff --git a/example/tst_dvect2.py b/example/tst_dvect2.py
index 539e0b88..2e72bf8b 100644
--- a/example/tst_dvect2.py
+++ b/example/tst_dvect2.py
@@ -87,12 +87,18 @@ if (__name__ == "__main__"):
   import sys, string
   broken_auto_ptr = 0
   n = 1
-  if (len(sys.argv) > 1):
-    if (sys.argv[1] == "--broken-auto-ptr"):
-      broken_auto_ptr = 1
-      if (len(sys.argv) > 2):
-        n = string.atoi(sys.argv[2])
-    else:
-      n = string.atoi(sys.argv[1])
+  
+  if len(sys.argv) > 1:
+      argv = []
+      
+      for x in sys.argv:
+        if x != '--broken_auto_ptr':
+          argv.append(x)
+      broken_auto_ptr = argv != sys.argv
+      sys.argv = argv
+
+      if len(sys.argv) > 1:
+        n = string.atoi(sys.argv[1])
+        
   for i in xrange(n):
     f(broken_auto_ptr)
diff --git a/example/tst_ivect2.py b/example/tst_ivect2.py
index 6ffd2826..e7607151 100644
--- a/example/tst_ivect2.py
+++ b/example/tst_ivect2.py
@@ -87,12 +87,18 @@ if (__name__ == "__main__"):
   import sys, string
   broken_auto_ptr = 0
   n = 1
-  if (len(sys.argv) > 1):
-    if (sys.argv[1] == "--broken-auto-ptr"):
-      broken_auto_ptr = 1
-      if (len(sys.argv) > 2):
-        n = string.atoi(sys.argv[2])
-    else:
-      n = string.atoi(sys.argv[1])
+
+  if len(sys.argv) > 1:
+      argv = []
+      
+      for x in sys.argv:
+        if x != '--broken_auto_ptr':
+          argv.append(x)
+      broken_auto_ptr = argv != sys.argv
+      sys.argv = argv
+
+      if len(sys.argv) > 1:
+        n = string.atoi(sys.argv[1])
+        
   for i in xrange(n):
     f(broken_auto_ptr)