diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 97ca2b7..a25085f 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -2491,14 +2491,26 @@ public class TestingList extends Panel {
         while (it.hasNext()) {
             Map.Entry pair = (Map.Entry)it.next();
             System.out.println(pair.getKey() + " = " + pair.getValue());
-            it.remove(); // avoids a ConcurrentModificationException
+            Iterator subit = deviceParams.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry subpair = (Map.Entry)subit.next();
+                System.out.println(subpair.getKey() + " = " + subpair.getValue());
+                subit.remove(); // avoids a ConcurrentModificationException
+            }  
+        it.remove(); // avoids a ConcurrentModificationException
         }        
         it = testParams.entrySet().iterator();
         while (it.hasNext()) {
             Map.Entry pair = (Map.Entry)it.next();
             System.out.println(pair.getKey() + " = " + pair.getValue());
-            it.remove(); // avoids a ConcurrentModificationException
-        }        
+            Iterator subit = deviceParams.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry subpair = (Map.Entry)subit.next();
+                System.out.println(subpair.getKey() + " = " + subpair.getValue());
+                subit.remove(); // avoids a ConcurrentModificationException
+            }  
+        it.remove(); // avoids a ConcurrentModificationException
+        }         
         return testParams;
     }