diff --git a/Upsilon/BaseTypes/ScriptTable/NumeratedScriptTable.cs b/Upsilon/BaseTypes/ScriptTable/NumeratedScriptTable.cs
index def1a8a..d330617 100644
--- a/Upsilon/BaseTypes/ScriptTable/NumeratedScriptTable.cs
+++ b/Upsilon/BaseTypes/ScriptTable/NumeratedScriptTable.cs
@@ -19,10 +19,6 @@ namespace Upsilon.BaseTypes.ScriptTable
             }
         }
 
-        IEnumerator<ScriptType> IEnumerable<ScriptType>.GetEnumerator()
-        {
-            return GetScriptEnumerator();
-        }
 
         public override System.Type GetCSharpType()
         {
@@ -34,9 +30,17 @@ namespace Upsilon.BaseTypes.ScriptTable
             return EvaluationScope.Variables.Select(x => x.Value.ToCSharpObject()).ToArray();
         }
 
-        public IEnumerator GetEnumerator()
+        public IEnumerator<ScriptType> GetEnumerator()
         {
-            return GetScriptEnumerator();
+            foreach (var variable in EvaluationScope.Variables)
+            {
+                yield return variable.Value;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
         }
     }
 }
\ No newline at end of file