diff --git a/src/tilda/data/_Tilda/TILDA__CONNECTION_Factory.java b/src/tilda/data/_Tilda/TILDA__CONNECTION_Factory.java
index 5e35ba7f8..0ca0ce7b5 100644
--- a/src/tilda/data/_Tilda/TILDA__CONNECTION_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__CONNECTION_Factory.java
@@ -570,7 +570,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Connection_Data> L, i
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__DATEDIM_Factory.java b/src/tilda/data/_Tilda/TILDA__DATEDIM_Factory.java
index bc22c3a74..a2fd9439b 100644
--- a/src/tilda/data/_Tilda/TILDA__DATEDIM_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__DATEDIM_Factory.java
@@ -824,7 +824,7 @@ public static int WriteBatch(Connection C, List<tilda.data.DateDim_Data> L, int
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__DATELIMITDIM_Factory.java b/src/tilda/data/_Tilda/TILDA__DATELIMITDIM_Factory.java
index 7a5e92e4b..bce19d919 100644
--- a/src/tilda/data/_Tilda/TILDA__DATELIMITDIM_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__DATELIMITDIM_Factory.java
@@ -344,7 +344,7 @@ public static int WriteBatch(Connection C, List<tilda.data.DateLimitDim_Data> L,
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__DEPENDENCYDDLDUMMYTABLE_Factory.java b/src/tilda/data/_Tilda/TILDA__DEPENDENCYDDLDUMMYTABLE_Factory.java
index 6174d29dc..a5dd36154 100644
--- a/src/tilda/data/_Tilda/TILDA__DEPENDENCYDDLDUMMYTABLE_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__DEPENDENCYDDLDUMMYTABLE_Factory.java
@@ -491,7 +491,7 @@ public static int WriteBatch(Connection C, List<tilda.data.DependencyDDLDummyTab
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__FORMULADEPENDENCY_Factory.java b/src/tilda/data/_Tilda/TILDA__FORMULADEPENDENCY_Factory.java
index ae6926ad0..25cf610c1 100644
--- a/src/tilda/data/_Tilda/TILDA__FORMULADEPENDENCY_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__FORMULADEPENDENCY_Factory.java
@@ -396,7 +396,7 @@ public static int WriteBatch(Connection C, List<tilda.data.FormulaDependency_Dat
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__FORMULARESULT_Factory.java b/src/tilda/data/_Tilda/TILDA__FORMULARESULT_Factory.java
index c1ace440f..91f153d85 100644
--- a/src/tilda/data/_Tilda/TILDA__FORMULARESULT_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__FORMULARESULT_Factory.java
@@ -420,7 +420,7 @@ public static int WriteBatch(Connection C, List<tilda.data.FormulaResult_Data> L
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__FORMULA_Factory.java b/src/tilda/data/_Tilda/TILDA__FORMULA_Factory.java
index 660d93f10..9a491700c 100644
--- a/src/tilda/data/_Tilda/TILDA__FORMULA_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__FORMULA_Factory.java
@@ -604,7 +604,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Formula_Data> L, int
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__JOBPARTMESSAGE_Factory.java b/src/tilda/data/_Tilda/TILDA__JOBPARTMESSAGE_Factory.java
index 4b49e7501..bf1d1e9f9 100644
--- a/src/tilda/data/_Tilda/TILDA__JOBPARTMESSAGE_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__JOBPARTMESSAGE_Factory.java
@@ -481,7 +481,7 @@ public static int WriteBatch(Connection C, List<tilda.data.JobPartMessage_Data>
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__JOBPART_Factory.java b/src/tilda/data/_Tilda/TILDA__JOBPART_Factory.java
index ed634b287..a10d37853 100644
--- a/src/tilda/data/_Tilda/TILDA__JOBPART_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__JOBPART_Factory.java
@@ -675,7 +675,7 @@ public static int WriteBatch(Connection C, List<tilda.data.JobPart_Data> L, int
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__JOB_Factory.java b/src/tilda/data/_Tilda/TILDA__JOB_Factory.java
index 0611f87a9..3f2bfc9ac 100644
--- a/src/tilda/data/_Tilda/TILDA__JOB_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__JOB_Factory.java
@@ -668,7 +668,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Job_Data> L, int batc
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__KEY_Factory.java b/src/tilda/data/_Tilda/TILDA__KEY_Factory.java
index 359d4e032..ec43a7508 100644
--- a/src/tilda/data/_Tilda/TILDA__KEY_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__KEY_Factory.java
@@ -449,7 +449,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Key_Data> L, int batc
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__MAINTENANCE_Factory.java b/src/tilda/data/_Tilda/TILDA__MAINTENANCE_Factory.java
index 2f0edabb1..0fbb3ba3d 100644
--- a/src/tilda/data/_Tilda/TILDA__MAINTENANCE_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__MAINTENANCE_Factory.java
@@ -420,7 +420,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Maintenance_Data> L,
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__MAPPING_Factory.java b/src/tilda/data/_Tilda/TILDA__MAPPING_Factory.java
index 4dab3bfb1..efc788aff 100644
--- a/src/tilda/data/_Tilda/TILDA__MAPPING_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__MAPPING_Factory.java
@@ -422,7 +422,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Mapping_Data> L, int
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__MEASUREFORMULA_Factory.java b/src/tilda/data/_Tilda/TILDA__MEASUREFORMULA_Factory.java
index b5ef8cde0..7872231b1 100644
--- a/src/tilda/data/_Tilda/TILDA__MEASUREFORMULA_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__MEASUREFORMULA_Factory.java
@@ -396,7 +396,7 @@ public static int WriteBatch(Connection C, List<tilda.data.MeasureFormula_Data>
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__MEASURE_Factory.java b/src/tilda/data/_Tilda/TILDA__MEASURE_Factory.java
index 7d8d6cdef..323b05bf0 100644
--- a/src/tilda/data/_Tilda/TILDA__MEASURE_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__MEASURE_Factory.java
@@ -423,7 +423,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Measure_Data> L, int
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__OBJECTPERF_Factory.java b/src/tilda/data/_Tilda/TILDA__OBJECTPERF_Factory.java
index aa0fbcd70..2ea776604 100644
--- a/src/tilda/data/_Tilda/TILDA__OBJECTPERF_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__OBJECTPERF_Factory.java
@@ -848,7 +848,7 @@ public static int WriteBatch(Connection C, List<tilda.data.ObjectPerf_Data> L, i
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__REFILLPERF_Factory.java b/src/tilda/data/_Tilda/TILDA__REFILLPERF_Factory.java
index 3807b3591..9da34ff82 100644
--- a/src/tilda/data/_Tilda/TILDA__REFILLPERF_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__REFILLPERF_Factory.java
@@ -568,7 +568,7 @@ public static int WriteBatch(Connection C, List<tilda.data.RefillPerf_Data> L, i
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__TESTING_Factory.java b/src/tilda/data/_Tilda/TILDA__TESTING_Factory.java
index 957a7259e..404e404d5 100644
--- a/src/tilda/data/_Tilda/TILDA__TESTING_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__TESTING_Factory.java
@@ -1295,7 +1295,7 @@ public static int WriteBatch(Connection C, List<tilda.data.Testing_Data> L, int
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__TRANSPERF_Factory.java b/src/tilda/data/_Tilda/TILDA__TRANSPERF_Factory.java
index 98538300e..fd0a6aae0 100644
--- a/src/tilda/data/_Tilda/TILDA__TRANSPERF_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__TRANSPERF_Factory.java
@@ -1132,7 +1132,7 @@ public static int WriteBatch(Connection C, List<tilda.data.TransPerf_Data> L, in
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/data/_Tilda/TILDA__ZONEINFO_Factory.java b/src/tilda/data/_Tilda/TILDA__ZONEINFO_Factory.java
index 0e401815f..7a0766041 100644
--- a/src/tilda/data/_Tilda/TILDA__ZONEINFO_Factory.java
+++ b/src/tilda/data/_Tilda/TILDA__ZONEINFO_Factory.java
@@ -471,7 +471,7 @@ public static int WriteBatch(Connection C, List<tilda.data.ZoneInfo_Data> L, int
                PS.clearParameters();
              }
 
-           if (index != 0 && (index + 1) % batchSize != 0)
+           if ((index + 1) % batchSize != 0)
              {
                int[] results = PS.executeBatch();
                int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);
diff --git a/src/tilda/generation/java8/TildaFactory.java b/src/tilda/generation/java8/TildaFactory.java
index 63dce2aaa..bbc6fb10a 100644
--- a/src/tilda/generation/java8/TildaFactory.java
+++ b/src/tilda/generation/java8/TildaFactory.java
@@ -979,7 +979,7 @@ public void genBatchWrite(PrintWriter Out, GeneratorSession G, Object O)
         Out.println("               PS.clearParameters();");
         Out.println("             }");
         Out.println();
-        Out.println("           if (index != 0 && (index + 1) % batchSize != 0)");
+        Out.println("           if ((index + 1) % batchSize != 0)");
         Out.println("             {");
         Out.println("               int[] results = PS.executeBatch();");
         Out.println("               int failedRec = JDBCHelper.batchWriteDone(results, L.size() - insertCount);");