diff --git a/app/Import/Definitions/TaskMap.php b/app/Import/Definitions/TaskMap.php
index 08af5d591b1a..c2218341c3f6 100644
--- a/app/Import/Definitions/TaskMap.php
+++ b/app/Import/Definitions/TaskMap.php
@@ -31,9 +31,9 @@ class TaskMap
             12 => 'task.duration',
             13 => 'task.status',
             14 => 'task.custom_value1',
-            15 => 'task.custom_value1',
-            16 => 'task.custom_value1',
-            17 => 'task.custom_value1',
+            15 => 'task.custom_value2',
+            16 => 'task.custom_value3',
+            17 => 'task.custom_value4',
             18 => 'task.notes',
         ];
     }
diff --git a/app/Import/Transformer/Csv/TaskTransformer.php b/app/Import/Transformer/Csv/TaskTransformer.php
index cfe44f7676c4..d2c6d4538f33 100644
--- a/app/Import/Transformer/Csv/TaskTransformer.php
+++ b/app/Import/Transformer/Csv/TaskTransformer.php
@@ -115,11 +115,22 @@ class TaskTransformer extends BaseTransformer
             $this->stubbed_timestamp = $stub_start_date->timestamp;
 
             return $stub_start_date->timestamp;
+        } catch (\Exception $e) {
+            nlog("fall back failed too" . $e->getMessage());
+            // return $this->stubbed_timestamp;
+        }
+
+
+        try {
+
+            $stub_start_date = \Carbon\Carbon::createFromFormat($this->company->date_format(), $stub_start_date);
+            $this->stubbed_timestamp = $stub_start_date->timestamp;
         } catch (\Exception $e) {
             nlog($e->getMessage());
             return $this->stubbed_timestamp;
         }
 
+
     }
 
     private function resolveEndDate($item)
@@ -142,9 +153,23 @@ class TaskTransformer extends BaseTransformer
         } catch (\Exception $e) {
             nlog($e->getMessage());
 
+            // return $this->stubbed_timestamp;
+        }
+
+
+
+        try {
+
+            $stub_end_date = \Carbon\Carbon::createFromFormat($this->company->date_format(), $stub_end_date);
+            $this->stubbed_timestamp = $stub_end_date->timestamp;
+        } catch (\Exception $e) {
+            nlog("fall back failed too" . $e->getMessage());
             return $this->stubbed_timestamp;
         }
 
+
+
+
     }
 
     private function getTaskStatusId($item): ?int