diff --git a/include/maskfld.cpp b/include/maskfld.cpp
index 3976c4570..ce2c937b4 100755
--- a/include/maskfld.cpp
+++ b/include/maskfld.cpp
@@ -2745,15 +2745,15 @@ bool TDate_field::on_key(KEY key)
 
     if (data.not_empty())
     {
-      TDate d(data);
-      if (!d.ok())
+      //      TDate d(data);
+      if (!TDate::isdate(data))
       {
         error_box("Data errata o formato non valido");
         return FALSE;
       }
       else
         if (changed)
-          TMask_field::set_window_data(d.string());
+          TMask_field::set_window_data(data);
     }
   }