diff --git a/src/core/random-variable.cc b/src/core/random-variable.cc
index 0ae315b89..a02f77af9 100644
--- a/src/core/random-variable.cc
+++ b/src/core/random-variable.cc
@@ -399,6 +399,7 @@ RandomVariable* WeibullVariable::Copy() const
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // NormalVariable methods
+const double NormalVariable::INFINITE_VALUE = 1e307;
 NormalVariable::NormalVariable() 
   : m_mean(0.0), m_variance(1.0), m_bound(INFINITE_VALUE), m_nextValid(false){}
 
diff --git a/src/core/random-variable.h b/src/core/random-variable.h
index 44dd553a3..602ad1832 100644
--- a/src/core/random-variable.h
+++ b/src/core/random-variable.h
@@ -30,7 +30,6 @@
  *
  */
 
-#define INFINITE_VALUE 1e307
 namespace ns3{
 
 class RngStream;
@@ -504,6 +503,7 @@ private:
 class NormalVariable : public RandomVariable { // Normally Distributed random var
 
 public:
+   static const double INFINITE_VALUE;
   /**
    * Constructs an normal random variable  with a mean
    * value of 0 and variance of 1.