diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb
index 72a2757..ecf7d7c 100644
--- a/ProductFunctionTester/Main_Form.vb
+++ b/ProductFunctionTester/Main_Form.vb
@@ -9,7 +9,7 @@ Imports uPLibrary.Networking.M2Mqtt
 
 Public Class Main_Form
     Public Program_Name As String = "DUALSONIC_Multi_Function_Tester Ver."
-    Public Program_Version As String = "2.1.0"
+    Public Program_Version As String = "2.1.2"
 
     ''데이터 베이스 테이블 목록
 
@@ -5994,10 +5994,10 @@ NormalEnd:
 
                     Next
 
-                    If TDSetCheck() Then
-                        FailMain()
-                        GoTo ProcessEnd
-                    End If
+                    'If TDSetCheck() Then
+                    '    FailMain()
+                    '    GoTo ProcessEnd
+                    'End If
 
                     If EPTestRun() Then
                         FailMain()
@@ -7258,8 +7258,9 @@ dbFail:
 
             If DBCommand(DBCmd) = False Then
                 txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
+                GoTo dbFail
             End If
-            GoTo dbFail
+
         End If
 
         For i = 1 To nudSaveCk.Value
@@ -7303,7 +7304,7 @@ dbFail:
         TestRunningState(testRunningList.Running, Color.Yellow)
 
         Dim sucSwitch As Boolean = False
-        Dim chooseTDTable As String = If(formType = formTypeList.prdHFLDMEP, TDTableNow, NonTDTableNow)
+        Dim chooseTDTable As String = TDTableNow
 
         DBCmd = "SELECT EXISTS(SELECT 1 FROM " & rfTableNow & " WHERE PV_SN='" & TestData.Test_Serial & "') AS A;"
 
@@ -7332,17 +7333,20 @@ dbFail:
             GoTo dbFail
         End If
 
+        If Not formType = formTypeList.prdHFLDMEP Then
+            chooseTDTable = NonTDTableNow
+            If TDDataSet(TD_Data.TestStep) = "11" Then
+                DBCmd = "INSERT INTO " & chooseTDTable & "(TestStep,PV_SN,P1_DateTime,Fw_Ver,DivTemp,CtTemp,BatteryLv) VALUES('" & processNum & "','" & TestData.Test_Serial & "','" & NowDate & " " & NowTime & "','" & TestData.Test_Firmware & "','" & TestData.Test_Temperature(TempData.DivTemp) & "','" & TestData.Test_Temperature(TempData.CartTemp) & "','" & TestData.Test_Battery & "')"
 
-        If TDDataSet(TD_Data.TestStep) = "11" Then
-            DBCmd = "INSERT INTO " & NonTDTableNow & "(TestStep,PV_SN,P1_DateTime,Fw_Ver,DivTemp,CtTemp,BatteryLv) VALUES('" & processNum & "','" & TestData.Test_Serial & "','" & NowDate & " " & NowTime & "','" & TestData.Test_Firmware & "','" & TestData.Test_Temperature(TempData.DivTemp) & "','" & TestData.Test_Temperature(TempData.CartTemp) & "','" & TestData.Test_Battery & "')"
-
-            If DBCommand(DBCmd) = False Then
-                txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
+                If DBCommand(DBCmd) = False Then
+                    txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
+                    GoTo dbFail
+                End If
             End If
-            GoTo dbFail
         End If
 
 
+
         For i = 1 To nudSaveCk.Value
             sucSwitch = False
             DBCmd = "UPDATE " & chooseTDTable & " SET TestStep='" & processNum & "' WHERE PV_SN = '" & TestData.Test_Serial & "'"