1 files changed, 7 insertions, 9 deletions
diff --git a/RhSolutions.ExcelExtensions/ColumnsEnumerator.cs b/RhSolutions.ExcelExtensions/ColumnsEnumerator.cs
index 578e2b0..40ad4d6 100644
--- a/RhSolutions.ExcelExtensions/ColumnsEnumerator.cs
+++ b/RhSolutions.ExcelExtensions/ColumnsEnumerator.cs
@@ -4,9 +4,8 @@ namespace RhSolutions.ExcelExtensions;
 
 public class ColumnsEnumerator: IEnumerator<Column>
 {
-    public Range Range { get; }
-    public Table ParentTable { get; }
-    private int position = 0;
+    private Columns _columns;
+    private int position = -1;
     object IEnumerator.Current
     {
         get
@@ -21,7 +20,7 @@ public class ColumnsEnumerator: IEnumerator<Column>
         {
             try
             {
-                return new Column(Range.Columns[position], ParentTable);
+                return _columns[position];
             }
             catch (IndexOutOfRangeException)
             {
@@ -30,21 +29,20 @@ public class ColumnsEnumerator: IEnumerator<Column>
         }
     }
 
-    public ColumnsEnumerator(Range range, Table table)
+    public ColumnsEnumerator(Columns columns)
     {
-        Range = range;
-        ParentTable = table;
+        _columns = columns;
     }
 
     public bool MoveNext()
     {
         position++;
-        return (position <= Range.Columns.Count);
+        return (position < _columns.Length);
     }
 
     public void Reset()
     {
-        position = 0;
+        position = -1;
     }
 
     public void Dispose()