diff --git a/src/classes/Makefile.PMusr b/src/classes/Makefile.PMusr
index b1e576a0..d44b9c4d 100644
--- a/src/classes/Makefile.PMusr
+++ b/src/classes/Makefile.PMusr
@@ -42,7 +42,8 @@ endif
 # -- Linux
 ifeq ($(OS),LINUX)
 CXX           = g++
-CXXFLAGS      = -O3 -Wall -Wno-trigraphs -fPIC
+#CXXFLAGS      = -O3 -Wall -Wno-trigraphs -fPIC
+CXXFLAGS      = -O1 -Wall -Wno-trigraphs -fPIC
 PMUSRPATH     = ../include
 MNPATH        = $(ROOTSYS)/include
 GSLPATH       = /usr/include/gsl
diff --git a/src/classes/PRunAsymmetry.cpp b/src/classes/PRunAsymmetry.cpp
index c5728f0c..d07acd2c 100644
--- a/src/classes/PRunAsymmetry.cpp
+++ b/src/classes/PRunAsymmetry.cpp
@@ -930,7 +930,7 @@ bool PRunAsymmetry::PrepareViewData(PRawRunData* runData, unsigned int histoNo[2
   for (unsigned int i=0; i<size; i++) {
     time = startTime + (double)i*fTimeResolution;
     value = fTheory->Func(time, par, fFuncValues);
-    if (value > 10.0) {  // dirty hack needs to be fixed!!
+    if (fabs(value) > 10.0) {  // dirty hack needs to be fixed!!
       value = 0.0;
     }
     fData.fTheory.push_back(value);
diff --git a/src/classes/PRunSingleHisto.cpp b/src/classes/PRunSingleHisto.cpp
index c2fa17a8..441e1b87 100644
--- a/src/classes/PRunSingleHisto.cpp
+++ b/src/classes/PRunSingleHisto.cpp
@@ -668,7 +668,7 @@ cout << endl << ">> data start time = " << fData.fDataTimeStart;
   for (unsigned int i=0; i<size; i++) {
     time = fData.fTheoryTimeStart + i*fTimeResolution;
     theoryValue = fTheory->Func(time, par, fFuncValues);
-    if (theoryValue > 10.0) {  // dirty hack needs to be fixed!!
+    if (fabs(theoryValue) > 10.0) {  // dirty hack needs to be fixed!!
       theoryValue = 0.0;
     }
     fData.fTheory.push_back(N0*TMath::Exp(-time/tau)*(1+theoryValue)+bkg);
@@ -823,7 +823,7 @@ cout << endl << "--------------------------------";
   for (unsigned int i=0; i<size; i++) {
     time = fData.fTheoryTimeStart + (double)i*fTimeResolution;
     theoryValue = fTheory->Func(time, par, fFuncValues);
-    if (theoryValue > 10.0) { // dirty hack needs to be fixed!!
+    if (fabs(theoryValue) > 10.0) { // dirty hack needs to be fixed!!
       theoryValue = 0.0;
     }
     fData.fTheory.push_back(theoryValue);