Index: /trunk/Mars/mhbase/MFillH.cc
===================================================================
--- /trunk/Mars/mhbase/MFillH.cc	(revision 19306)
+++ /trunk/Mars/mhbase/MFillH.cc	(revision 19307)
@@ -606,11 +606,22 @@
     {
         const TString opt(MString::Format("nonew %s", fDrawOption.Data()));
-        // fCanvas->cd();
-        // fCanvas->Clear();
-
-        // Remove the old class to prevent clashes calling
-        // Paint-functions when the display is updated
+
+        // Remove the old class from the canvas to avoid that it is deleted
         fCanvas->GetListOfPrimitives()->Remove(fH);
-        fCanvas->GetListOfPrimitives()->Add(fH->Clone(), opt);
+
+        // change into canvas
+        fCanvas->cd();
+
+        // Now clear the canvas from everything fH might have added there
+        // (this should be done only if this is not called with 'same')
+        //fCanvas->Clear();           // already in MH::DrawClone()
+
+        // Make sure that TGraphs go to the correct pads
+        //gROOT->SetSelectedPad(0);   // already in MH::DrawClone()
+
+        // Now create a clone and draw it to the canvas
+        fH->DrawClone(opt);
+
+        // Make sure the update is displayed
         fCanvas->Modified();
         fCanvas->Update();
