diff --git a/src/include/date.cpp b/src/include/date.cpp
index 28192af3c..d74575147 100755
--- a/src/include/date.cpp
+++ b/src/include/date.cpp
@@ -541,11 +541,7 @@ bool TDate::isdate(const char* s)
   return d <= last_day(m,y);
 }
 
-bool TDate::ok() const
-{ return _val > 0; }
-
 // @doc EXTERNAL
-
 // @func TDate& | operator + | Incrementa la data di un certo numero di giorni
 TDate operator +(
   const TDate& a,  // @parm Data a cui aggiungere i giorni
diff --git a/src/include/date.h b/src/include/date.h
index 581c7d695..bc11286f8 100755
--- a/src/include/date.h
+++ b/src/include/date.h
@@ -8,6 +8,8 @@
 
 #define NULLDATE 0L
 #define TODAY  -1L
+#define BOTIME 0L
+#define EOTIME 30001231L
 
 // @doc EXTERNAL
 
@@ -101,8 +103,8 @@ public:
   // @cmember Aggiunge degli anni
   void addyear(int nyear = 1);
   // @cmember Controlla se si tratta di una data corretta
-  bool ok() const;
-  // @cmember Controlla se la stringa passata e' una data corretta
+  bool ok() const { return _val > BOTIME && _val < EOTIME; }
+	// @cmember Controlla se la stringa passata e' una data corretta
   static bool isdate(const char*);
 
   // @cmember Ritorna l'ultimo giorno possibile del mese
@@ -296,6 +298,6 @@ const TDate& fnc_max(const TDate& a, const TDate& b);
 const char* itom(int month);
 const char* itow(int dayofweek);
 
-const TDate botime(0,0,0), eotime(31,12,3000), nulldate(NULLDATE);
+const TDate botime(BOTIME), eotime(EOTIME), nulldate(NULLDATE);
 
 #endif // __DATE_H