diff --git a/utility/Machine.F90 b/utility/Machine.F90
index 30dc26a8..6209deb8 100644
--- a/utility/Machine.F90
+++ b/utility/Machine.F90
@@ -18,9 +18,9 @@ module Machine
   integer, public, parameter :: kind_noahmp = 4 ! single precision
 #endif
 
-  integer,                public, parameter :: undefined_int  = huge(1)    ! undefined integer for variable initialization
-  real(kind=kind_noahmp), public, parameter :: undefined_real = huge(1.0)  ! undefined real for variable initializatin
-  integer,                public, parameter :: undefined_int_neg  = -999   ! undefined integer negative for variable initialization
-  real(kind=kind_noahmp), public, parameter :: undefined_real_neg = -999.0 ! undefined real negative for variable initializatin
+  integer,                public, parameter :: undefined_int  = -99999       ! undefined integer for variable initialization
+  real(kind=kind_noahmp), public, parameter :: undefined_real = -99999.0     ! undefined real for variable initializatin
+  integer,                public, parameter :: undefined_int_neg  = -99999   ! undefined integer negative for variable initialization
+  real(kind=kind_noahmp), public, parameter :: undefined_real_neg = -99999.0 ! undefined real negative for variable initializatin
 
 end module Machine