Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 5512)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 5513)
@@ -192,7 +192,7 @@
         {
           fLoGainFirstSave = fLoGainFirst;
-          fLoGainFirst     = (Int_t)(timehi+fLoGainStartShift);
-          fLoGainFirst     = fLoGainFirst < fLoGainFirstSave ? fLoGainFirstSave : fLoGainFirst;
-          
+          const Int_t logainstart = (Int_t)(timehi+fLoGainStartShift);
+          fLoGainFirst     = logainstart > 0 ? logainstart : fLoGainFirstSave;
+        
           if ( fLoGainFirst < fLoGainLast )
             {