diff --git a/ClosedXML_Examples/PivotTables/PivotTables.cs b/ClosedXML_Examples/PivotTables/PivotTables.cs
index 8f19d35..9d627d1 100644
--- a/ClosedXML_Examples/PivotTables/PivotTables.cs
+++ b/ClosedXML_Examples/PivotTables/PivotTables.cs
@@ -59,10 +59,6 @@
                 var source = sheet.Cell(1, 1).InsertTable(pastries, "PastrySalesData", true);
                 sheet.Columns().AdjustToContents();
 
-                // Create a range that includes our table, including the header row
-                var range = source.DataRange;
-                var header = sheet.Range(1, 1, 1, 3);
-                var dataRange = sheet.Range(header.FirstCell(), range.LastCell());
 
                 IXLWorksheet ptSheet;
                 IXLPivotTable pt;
@@ -75,7 +71,7 @@
                     ptSheet = wb.Worksheets.Add("pvt" + i);
 
                     // Create the pivot table, using the data from the "PastrySalesData" table
-                    pt = ptSheet.PivotTables.AddNew("pvt", ptSheet.Cell(1, 1), dataRange);
+                    pt = ptSheet.PivotTables.AddNew("pvt", ptSheet.Cell(1, 1), source.AsRange());
 
                     // The rows in our pivot table will be the names of the pastries
                     pt.RowLabels.Add("Name");
@@ -109,7 +105,7 @@
                 #region Different kind of pivot
 
                 ptSheet = wb.Worksheets.Add("pvtNoColumnLabels");
-                pt = ptSheet.PivotTables.AddNew("pvtNoColumnLabels", ptSheet.Cell(1, 1), dataRange);
+                pt = ptSheet.PivotTables.AddNew("pvtNoColumnLabels", ptSheet.Cell(1, 1), source.AsRange());
 
                 pt.RowLabels.Add("Name");
                 pt.RowLabels.Add("Month");
@@ -124,7 +120,7 @@
                 #region Pivot table with collapsed fields
 
                 ptSheet = wb.Worksheets.Add("pvtCollapsedFields");
-                pt = ptSheet.PivotTables.AddNew("pvtCollapsedFields", ptSheet.Cell(1, 1), dataRange);
+                pt = ptSheet.PivotTables.AddNew("pvtCollapsedFields", ptSheet.Cell(1, 1), source.AsRange());
 
                 pt.RowLabels.Add("Name").SetCollapsed();
                 pt.RowLabels.Add("Month").SetCollapsed();
@@ -137,7 +133,7 @@
                 #region Pivot table with a field both as a value and as a row/column/filter label
 
                 ptSheet = wb.Worksheets.Add("pvtFieldAsValueAndLabel");
-                pt = ptSheet.PivotTables.AddNew("pvtFieldAsValueAndLabel", ptSheet.Cell(1, 1), dataRange);
+                pt = ptSheet.PivotTables.AddNew("pvtFieldAsValueAndLabel", ptSheet.Cell(1, 1), source.AsRange());
 
                 pt.RowLabels.Add("Name");
                 pt.RowLabels.Add("Month");
@@ -151,7 +147,7 @@
                 ptSheet = wb.Worksheets.Add("pvtHideSubTotals");
 
                 // Create the pivot table, using the data from the "PastrySalesData" table
-                pt = ptSheet.PivotTables.AddNew("pvtHidesubTotals", ptSheet.Cell(1, 1), dataRange);
+                pt = ptSheet.PivotTables.AddNew("pvtHidesubTotals", ptSheet.Cell(1, 1), source.AsRange());
 
                 // The rows in our pivot table will be the names of the pastries
                 pt.RowLabels.Add(XLConstants.PivotTableValuesSentinalLabel);
@@ -181,7 +177,7 @@
 
                 ptSheet = wb.Worksheets.Add("pvtFilter");
 
-                pt = ptSheet.PivotTables.AddNew("pvtFilter", ptSheet.Cell(1, 1), dataRange);
+                pt = ptSheet.PivotTables.AddNew("pvtFilter", ptSheet.Cell(1, 1), source.AsRange());
 
                 pt.RowLabels.Add("Month");
 
@@ -202,7 +198,7 @@
                 #region Pivot table sorting
 
                 ptSheet = wb.Worksheets.Add("pvtSort");
-                pt = ptSheet.PivotTables.AddNew("pvtSort", ptSheet.Cell(1, 1), dataRange);
+                pt = ptSheet.PivotTables.AddNew("pvtSort", ptSheet.Cell(1, 1), source.AsRange());
 
                 pt.RowLabels.Add("Name").SetSort(XLPivotSortType.Ascending);
                 pt.RowLabels.Add("Month").SetSort(XLPivotSortType.Descending);
@@ -218,7 +214,7 @@
 
                 ptSheet = wb.Worksheets.Add("pvtInteger");
 
-                pt = ptSheet.PivotTables.AddNew("pvtInteger", ptSheet.Cell(1, 1), dataRange);
+                pt = ptSheet.PivotTables.AddNew("pvtInteger", ptSheet.Cell(1, 1), source.AsRange());
 
                 pt.RowLabels.Add("Name");
                 pt.RowLabels.Add("Code");