diff --git a/src/components/date-control.vue b/src/components/date-control.vue
index e6982e5..52e7a89 100644
--- a/src/components/date-control.vue
+++ b/src/components/date-control.vue
@@ -113,9 +113,15 @@ export default {
   },
   methods: {
     setToday() {
-      const v = window.$gz.locale
-        .nowUTC8601String(this.timeZoneName)
+      //Was this but in afternoon shows the next day ?!?
+      // const v = window.$gz.locale
+      //   .nowUTC8601String(this.timeZoneName)
+      //   .split("T")[0];
+
+      const v = window.$gz.DateTime.local()
+        .toString()
         .split("T")[0];
+
       this.updateDateValue(v);
       this.dlgdate = false;
     },
diff --git a/src/components/time-control.vue b/src/components/time-control.vue
index a1d09fb..a4c20f2 100644
--- a/src/components/time-control.vue
+++ b/src/components/time-control.vue
@@ -113,6 +113,7 @@ export default {
   },
   methods: {
     setNow() {
+      //was this but works the more simpler way copied from set today
       // const v = window.$gz.locale
       //   .nowUTC8601String(this.timeZoneName)
       //   .split("T")[1];