diff --git a/Makefile.Defines b/Makefile.Defines
index e44a50f44..50f95c7a0 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -57,7 +57,7 @@ SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdta
 PAR = -qopenmp #-parallel  #Something goes wrong in SyMBA at the moment with auto-paralellization enabled
 HEAPARR = -heap-arrays 4194304 
 OPTREPORT = -qopt-report=5 
-IPRODUCTION = -init=snan,arrays  -no-wrap-margin -O3 $(PAR) $(SIMDVEC) -fp-model fast #$(STRICTREAL) #$(HEAPARR)
+IPRODUCTION = -init=snan,arrays  -no-wrap-margin -O3 $(PAR) $(SIMDVEC) $(STRICTREAL) #$(HEAPARR)
 
 #gfortran flags
 GDEBUG = -g -Og -fbacktrace -fbounds-check -ffree-line-length-none
@@ -67,8 +67,7 @@ GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporari
 GPRODUCTION = -O2 -ffree-line-length-none $(GPAR)
 
 #FFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR)
-#FFLAGS = $(IPRODUCTION) $(OPTREPORT) $(ADVIXE_FLAGS)
-FFLAGS = -O3 $(PAR)  $(OPTREPORT)  $(SIMDVEC) # -shared-intel  -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -traceback -g
+FFLAGS = $(IPRODUCTION) $(OPTREPORT) #$(ADVIXE_FLAGS)
 FORTRAN = ifort
 #AR     = xiar