diff --git a/ChangeLog b/ChangeLog
index 41e3643f..2db83612 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ NEW any2many: an attempt to write the universial musr-data-file converter. Just
 NEW musrt0: added the possibility to show the t0 saved in the data file 's'. Furthermore added the option
     --getT0FromPromptPeak, -g with <firstGoodBinOffset>: will, in non-interactive mode estimate the t0's from 
     the prompt peak and write it into the msr-file (MUSR-133).
+FIXED plotting issues described in (MUSR-174).    
 FIXED accidental casting of a NULL pointer in msr2data
 FIXED crash of musrfit if a run-data-files is not found (MUSR-176)
 FIXED corrected time resolution for WKM from (ns) -> (us)
diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp
index 4b5915bd..05eea2eb 100644
--- a/src/classes/PMusrCanvas.cpp
+++ b/src/classes/PMusrCanvas.cpp
@@ -1762,10 +1762,6 @@ void PMusrCanvas::HandleDataSet(UInt_t plotNo, UInt_t runNo, PRunData *data)
       fYRangePresent = true;
       fYmin = ymin;
       fYmax = ymax;
-    } else {
-      fYRangePresent = true;
-      fYmin = -0.4;
-      fYmax = 0.4;
     }
   }
 
diff --git a/src/classes/PRunSingleHisto.cpp b/src/classes/PRunSingleHisto.cpp
index 1b27b794..ff70aaf2 100644
--- a/src/classes/PRunSingleHisto.cpp
+++ b/src/classes/PRunSingleHisto.cpp
@@ -830,7 +830,7 @@ Bool_t PRunSingleHisto::PrepareRawViewData(PRawRunData* runData, const UInt_t hi
   for (UInt_t i=0; i<size; i++) {
     time = fData.GetTheoryTimeStart() + i*fData.GetTheoryTimeStep();
     theoryValue = fTheory->Func(time, par, fFuncValues);
-    if (fabs(theoryValue) > 10.0) {  // dirty hack needs to be fixed!!
+    if (fabs(theoryValue) > 1.0e10) {  // dirty hack needs to be fixed!!
       theoryValue = 0.0;
     }
     fData.AppendTheoryValue(N0*TMath::Exp(-time/tau)*(1.0+theoryValue)+bkg);