diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 8391ffcee65c..dc0a1656486b 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -1181,10 +1181,18 @@ class Invoice extends EntityModel implements BalanceAffecting
         if (! $this->last_sent_date) {
             return true;
         } else {
+            $date1 = new DateTime($this->last_sent_date);
+            $date2 = new DateTime();
+            $diff = $date2->diff($date1);
+            $daysSinceLastSent = $diff->format('%a');
+            $monthsSinceLastSent = ($diff->format('%y') * 12) + $diff->format('%m');
+
+            /*
             $date1 = Carbon::parse($this->last_sent_date, $timezone);
             $date2 = Carbon::now($timezone);
             $daysSinceLastSent = $date1->diffInDays($date2);
             $monthsSinceLastSent = $date1->diffInMonths($date2);
+            */
 
             if ($daysSinceLastSent == 0) {
                 return false;
diff --git a/app/Models/Traits/GeneratesNumbers.php b/app/Models/Traits/GeneratesNumbers.php
index 352293419bc8..d3193ec22953 100644
--- a/app/Models/Traits/GeneratesNumbers.php
+++ b/app/Models/Traits/GeneratesNumbers.php
@@ -161,8 +161,8 @@ trait GeneratesNumbers
         if (count($matches) > 1) {
             $format = $matches[1];
             $search[] = $matches[0];
-            //$date = date_create()->format($format);
-            $date = Carbon::now(session(SESSION_TIMEZONE, DEFAULT_TIMEZONE))->format($format);
+            $date = date_create()->format($format);
+            //$date = Carbon::now(session(SESSION_TIMEZONE, DEFAULT_TIMEZONE))->format($format);
             $replace[] = str_replace($format, $date, $matches[1]);
         }