diff --git a/Makefile.Defines b/Makefile.Defines
index 849f205b1..d7244a886 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -51,7 +51,7 @@ COLLRESOLVE_HOME = $(ROOT_DIR)/collresolve/
 ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vecabi=cmdtarget -simd -shared-intel -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -xhost -traceback -parallel-source-info=2 
 #Be sure to set the environment variable KMP_FORKJOIN_FRAMES=1 for OpenMP debuging in vtune
 
-IDEBUG = -O0 -init=snan,arrays  -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -qopt-matmul -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margi-parallel-source-info=2 
+IDEBUG = -O2 -init=snan,arrays  -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -qopt-matmul -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin -parallel-source-info=2 
 STRICTREAL = -fp-model=precise -prec-div -prec-sqrt -assume protect-parens 
 SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -fp-model no-except -fma
 PAR = -qopenmp -parallel
@@ -69,8 +69,8 @@ GPRODUCTION = -O3 -ffree-line-length-none $(GPAR)
 INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include
 LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -lswiftest -lnetcdf -lnetcdff -qopt-matmul $(PAR)
 
-FSTRICTFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR)
-FFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR)
+FSTRICTFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR) $(HEAPARR)
+FFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR) $(HEAPARR)
 # FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) -g -traceback
 # FFLAGS  = $(IPRODUCTION) -fp-model=fast -g -traceback