diff --git a/src/Main_Class.ahk b/src/Main_Class.ahk
index 780ebb9..b238079 100644
--- a/src/Main_Class.ahk
+++ b/src/Main_Class.ahk
@@ -739,7 +739,7 @@
     ;if a EVE Window got closed this destroyes the Thumbnail and frees the memory.
     EvEWindowDestroy(hwnd?, WinTitle?) {
         if (IsSet(hwnd) && This.ThumbWindows.HasProp(hwnd)) {
-            for k, v in This.ThumbWindows.Clone().%hwnd% {
+            for k, v in This.ThumbWindows.%hwnd% {
                 if (K = "Thumbnail")
                     continue
                 v.Destroy()
@@ -749,13 +749,14 @@
             Return
         }
         ;If a EVE Windows get destroyed 
-        for Win_Hwnd,v in This.ThumbWindows.Clone().OwnProps() {
+        for Win_Hwnd, v in This.ThumbWindows.Clone().OwnProps() {
             if (!WinExist("Ahk_Id " Win_Hwnd)) {
-                for k,v in This.ThumbWindows.Clone().%Win_Hwnd% {
-                    if (K = "Thumbnail")
-                        continue
-                    v.Destroy()
-                }
+                if (IsObject(v))
+                    for k, guiObj in v {
+                        if (K = "Thumbnail")
+                            continue
+                        guiObj.Destroy()
+                    }
                 This.ThumbWindows.DeleteProp(Win_Hwnd)        
             }
         }