diff --git a/src/main/java/info/istlab/IoTP/SerialWindow.java b/src/main/java/info/istlab/IoTP/SerialWindow.java
index 058562d..a9a4f94 100644
--- a/src/main/java/info/istlab/IoTP/SerialWindow.java
+++ b/src/main/java/info/istlab/IoTP/SerialWindow.java
@@ -304,13 +304,13 @@
     }
 
     public static void disposeAll() {
-        for (String key : SerialWindow.hash.keySet()) {
-            System.out.println("Dispose "+key);
-            SerialWindow swin = SerialWindow.hash.get(key);
+        SerialWindow.hash.entrySet().forEach(ent -> {
+            // String key = ent.getKey();
+            SerialWindow swin = ent.getValue();
             if (swin != null) {
                 swin.disposeWin();
             }
-        }
+        });
         // SerialWindow.hash.clear();
     }