Index: trunk/MagicSoft/Mars/mmain/MAnalysis.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 951)
+++ trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 952)
@@ -230,11 +230,8 @@
     plist.AddToList(&hillas);
 
-    MHHillas *hists = new MHHillas;
-    plist.AddToList(hists);
-
-    MHStarMap *smap = new MHStarMap;
-    plist.AddToList(smap);
-
-    // FIXME: Where do we delete this two objects???
+    MHHillas  hists;
+    MHStarMap smap;
+    plist.AddToList(&hists);
+    plist.AddToList(&smap);
 
     //
@@ -254,10 +251,8 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree      read("Events", fInputFile);
-    MCerPhotCalc   ncalc;
-    MImgCleanStd   clean(cleanlvl1, cleanlvl2);
-    MHillasCalc    hcalc;
-    MFillH         hfill(&hillas, hists);
-    MFillH         sfill(&hillas, smap);
+    MReadTree    read("Events", fInputFile);
+    MCerPhotCalc ncalc;
+    MImgCleanStd clean(cleanlvl1, cleanlvl2);
+    MHillasCalc  hcalc;
 
     tlist.AddToList(&read);
@@ -265,6 +260,13 @@
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
-    tlist.AddToList(&hfill);
-    tlist.AddToList(&sfill);
+
+    MFillH hfill(&hillas, &hists);
+    MFillH sfill(&hillas, &smap);
+
+    if (displhillas)
+        tlist.AddToList(&hfill);
+
+    if (displstarmap)
+        tlist.AddToList(&sfill);
 
     //
@@ -283,11 +285,11 @@
     // After the analysis is finished we can display the histograms
     //
-
     if (displhillas)
-        hists->Draw();
+        hists.DrawClone();
 
     if (displstarmap)
-        smap->Draw();
-
+        smap.DrawClone();
+
+    cout << endl;
     cout << "Calculation of Hillas Parameters finished without error!" << endl;
 }
Index: trunk/MagicSoft/Mars/mmain/MBrowser.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MBrowser.cc	(revision 951)
+++ trunk/MagicSoft/Mars/mmain/MBrowser.cc	(revision 952)
@@ -255,4 +255,5 @@
     fInputFile[0] = '\0';
 
+    fList = new TList;
     fList->SetOwner();
 
@@ -308,4 +309,6 @@
     fClient->FreePicture(fPic2);
     fClient->FreePicture(fPic3);
+
+    delete fList;
 }