diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 9bd979e3..1e6e0942 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -244,15 +244,18 @@ export default {
       return false;
     }
 
-    valueStart = window.$gz.dayjs(valueStart);
-    valueEnd = window.$gz.dayjs(valueEnd);
+    // valueStart = window.$gz.dayjs(valueStart);
+    // valueEnd = window.$gz.dayjs(valueEnd);
+    valueStart = window.$gz.DateTime.fromISO(valueStart);
+    valueEnd = window.$gz.DateTime.fromISO(valueEnd);
 
     // if either is not valid.
-    if (!valueStart || !valueEnd) {
+    //moment.github.io/luxon/docs/manual/validity.html
+    https: if (!valueStart.isValid || !valueEnd.isValid) {
       return false;
     }
 
-    if (valueStart.isAfter(valueEnd)) {
+    if (valueStart > valueEnd) {
       //   "ErrorStartDateAfterEndDate": "Start date must be earlier than stop / end date",
       var err = window.$gz.locale.get("ErrorStartDateAfterEndDate");
       //Update the form status