diff --git a/app/Events/Common/DatesFormating.php b/app/Events/Common/DatesFormating.php
index bc600887bae..7108e5885ee 100644
--- a/app/Events/Common/DatesFormating.php
+++ b/app/Events/Common/DatesFormating.php
@@ -6,6 +6,8 @@
 
 class DatesFormating extends Event
 {
+    public $columns;
+
     public $request;
 
     /**
@@ -13,8 +15,9 @@ class DatesFormating extends Event
      *
      * @param $request
      */
-    public function __construct($request)
+    public function __construct($columns, $request)
     {
+        $this->columns = $columns;
         $this->request = $request;
     }
 }
diff --git a/app/Http/Middleware/DateFormat.php b/app/Http/Middleware/DateFormat.php
index 5368085fd13..f5d32e5bd6a 100644
--- a/app/Http/Middleware/DateFormat.php
+++ b/app/Http/Middleware/DateFormat.php
@@ -19,9 +19,8 @@ class DateFormat
     public function handle($request, Closure $next)
     {
         if (($request->method() == 'POST') || ($request->method() == 'PATCH')) {
-            event(new DatesFormating($request));
-
-            $fields = [
+            $columns = new \stdClass();
+            $columns->fields = [
                 'paid_at',
                 'due_at',
                 'issued_at',
@@ -32,6 +31,10 @@ public function handle($request, Closure $next)
                 'recurring_limit_date',
             ];
 
+            event(new DatesFormating($columns, $request));
+
+            $fields = $columns->fields;
+
             foreach ($fields as $field) {
                 $date = $request->get($field);