diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.ico b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/fpschartsource.ico
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.ico
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/fpschartsource.ico
diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/fpschartsource.lpi
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/fpschartsource.lpi
diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpr b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/fpschartsource.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpr
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/fpschartsource.lpr
diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.lfm b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/mainform.lfm
diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.pas b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/mainform.pas
diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/readme.txt
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/readme.txt
diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/test-data.xlsx b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/test-data.xlsx
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/test-data.xlsx
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource/test-data.xlsx
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.ico b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/fpschart.ico
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.ico
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/fpschart.ico
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/fpschart.lpi
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/fpschart.lpi
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpr b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/fpschart.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpr
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/fpschart.lpr
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.lfm b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/mainform.lfm
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.pas b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/mainform.pas
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/readme.txt
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/readme.txt
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t1.xls b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/t1.xls
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t1.xls
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/t1.xls
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t2.ods b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/t2.ods
similarity index 100%
rename from components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t2.ods
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource-deprecated/t2.ods
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas b/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
index cef43bf25..de0acd1ac 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
@@ -661,6 +661,7 @@ begin
     FWorkbookSource.AddListener(self);
 //  FWorkbook := GetWorkbook;
   ListenerNotification([lniWorkbook, lniWorksheet]);
+  Prepare;
 end;
 
 {@@ ----------------------------------------------------------------------------