diff --git a/applications/lazstats/source/forms/maindm.lfm b/applications/lazstats/source/forms/maindm.lfm
index 2f846da3a..67f030643 100644
--- a/applications/lazstats/source/forms/maindm.lfm
+++ b/applications/lazstats/source/forms/maindm.lfm
@@ -1,4 +1,5 @@
 object MainDataModule: TMainDataModule
+  OnCreate = DataModuleCreate
   OldCreateOrder = False
   Height = 143
   HorizontalOffset = 817
@@ -150,15 +151,4 @@ object MainDataModule: TMainDataModule
       00CB17F3FD0FCAFF17E77E0F33
     }
   end
-  object CHMHelpDatabase: TCHMHelpDatabase
-    AutoRegister = True
-    KeywordPrefix = 'html'
-    Left = 192
-    Top = 16
-  end
-  object LHelpConnector: TLHelpConnector
-    AutoRegister = True
-    Left = 192
-    Top = 80
-  end
 end
diff --git a/applications/lazstats/source/forms/maindm.pas b/applications/lazstats/source/forms/maindm.pas
index 9bf1ec835..7e946ebbd 100644
--- a/applications/lazstats/source/forms/maindm.pas
+++ b/applications/lazstats/source/forms/maindm.pas
@@ -12,12 +12,13 @@ type
   { TMainDataModule }
 
   TMainDataModule = class(TDataModule)
-    CHMHelpDatabase: TCHMHelpDatabase;
     ImageList: TImageList;
-    LHelpConnector: TLHelpConnector;
+    procedure DataModuleCreate(Sender: TObject);
   private
 
   public
+    CHMHelpDatabase: TCHMHelpDatabase;
+    LHelpConnector: TLHelpConnector;
 
   end;
 
@@ -26,6 +27,18 @@ var
 
 implementation
 
+{ TMainDataModule }
+
+procedure TMainDataModule.DataModuleCreate(Sender: TObject);
+begin
+  CHMHelpDatabase := TCHMHelpDatabase.Create(self);
+  CHMHelpDatabase.KeywordPrefix := 'html';
+  CHMHelpDatabase.AutoRegister := true;
+
+  LHelpConnector := TLHelpConnector.Create(self);
+  LHelpConnector.AutoRegister := true;
+end;
+
 initialization
   {$I maindm.lrs}
 
diff --git a/applications/lazstats/source/forms/mainunit.pas b/applications/lazstats/source/forms/mainunit.pas
index 74e408145..3ef636d3a 100644
--- a/applications/lazstats/source/forms/mainunit.pas
+++ b/applications/lazstats/source/forms/mainunit.pas
@@ -3,6 +3,15 @@
 //   Chip  --> Factor 1
 //   Probe --> Factor 2 (Factor 3 empty)
 
+{ ToDo:
+  - Help system:
+     - LHelp reports "no response" a while after LHelp was opened. LazStats is
+       not reacting during this time.
+     - LHelp window does not close when lazStats is closed.
+
+  - Diagram windows are incomplete in Linux --> Replace by TAChart?
+}
+
 unit MainUnit;
 
 {$mode objfpc}{$H+}
@@ -468,7 +477,7 @@ uses
   SigmaChartUnit, CUMSUMUNIT, CCHARTUNIT, PChartUnit, UChartUnit, CorSimUnit,
   ErrorCurvesUnit, PCurvesUnit, DistribUnit, GenSeqUnit, GenRndValsUnit,
   MultGenUnit, LoanItUnit, SumYrsDepUnit, SLDUnit, DblDeclineUnit,
-  RIDITUnit, TwoSLSUnit, WLSUnit, HelpUnit, SortCasesUnit,
+  RIDITUnit, TwoSLSUnit, WLSUnit, SortCasesUnit,
   SelectCasesUnit, GridHelpUnit, RecodeUnit, KappaUnit, AvgLinkUnit, kmeansunit,
   SingleLinkUnit, GenKappaUnit, CompareDistUnit, matmanunit, gradebookunit,
   ProbzUnit, ProbSmallerzUnit, TwozProbUnit, InversezUnit, ProbChiSqrUnit,
@@ -1311,7 +1320,7 @@ begin
     begin
       Maindatamodule.LHelpConnector.LHelpPath := lhelpfn;
       MainDatamodule.CHMHelpDatabase.Filename := helpfn;
-      CreateLCLHelpSystem;
+      //CreateLCLHelpSystem;
     end else
       MessageDlg('Help viewer LHelp.exe not found.' + LineEnding +
         'Please copy this program to the LazStats directory to access the help system.',