diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index ebd869a6c..ca5886cfb 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -737,7 +737,7 @@ FUNCTION ide2 (ignore)
         IdeDebugMode = 1
 
         FOR x = 1 TO totalVariablesCreated
-            usedVariableList(x).mostRecentValue = ""
+            IF usedVariableList(x).isarray = 0 THEN usedVariableList(x).mostRecentValue = ""
         NEXT
 
         EnterDebugMode:
diff --git a/source/qb64.bas b/source/qb64.bas
index 9567d655a..51680fadd 100644
--- a/source/qb64.bas
+++ b/source/qb64.bas
@@ -25981,10 +25981,11 @@ SUB manageVariableList (__name$, __cname$, localIndex AS LONG, action AS _BYTE)
                     usedVariableList(i).name = usedVariableList(i).name + "()"
                 ELSE
                     usedVariableList(i).isarray = 0
-                    usedVariableList(i).watchRange = ""
-                    usedVariableList(i).indexes = ""
-                    usedVariableList(i).elements = ""
                 END IF
+                usedVariableList(i).watchRange = ""
+                usedVariableList(i).indexes = ""
+                usedVariableList(i).elements = ""
+                usedVariableList(i).elementOffset = 0
                 totalVariablesCreated = totalVariablesCreated + 1
             END IF
         CASE ELSE 'find and mark as used