diff --git a/pom.xml b/pom.xml
index f85f332..5db1066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cz.foresttech</groupId>
     <artifactId>ForestDatabase</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/src/main/java/cz/foresttech/database/DatabaseEntityConvertor.java b/src/main/java/cz/foresttech/database/DatabaseEntityConvertor.java
index 0cb5d3f..0a80015 100644
--- a/src/main/java/cz/foresttech/database/DatabaseEntityConvertor.java
+++ b/src/main/java/cz/foresttech/database/DatabaseEntityConvertor.java
@@ -234,8 +234,8 @@ public String generateCreateScript(Class<?> clazz) {
      * @return a string representing a part of SQL script.
      */
     private <T> String processDeleteConditionScript(Class<T> clazz, T object) throws IllegalAccessException {
-        List<String> keys = new ArrayList<>();
-        List<String> values = new ArrayList<>();
+        StringBuilder keys = new StringBuilder();
+        StringBuilder values = new StringBuilder();
 
         for (Field field : clazz.getDeclaredFields()) {
             field.setAccessible(true);
@@ -251,12 +251,15 @@ private <T> String processDeleteConditionScript(Class<T> clazz, T object) throws
             DatabaseValueProcessor valueProcessor = databaseAPI.getProcessor(field.getType());
 
             String processedValue = processFieldValue(fieldValue, valueProcessor);
-            keys.add(dbName);
-            values.add(processedValue);
+            keys.append(dbName).append(",");
+            values.append(processedValue).append(",");
         }
 
         if (keys.isEmpty()) return "";
 
+        keys.setLength(keys.length() - 1);
+        values.setLength(values.length() - 1);
+
         return "(" + keys + ") = (" + values + ")";
     }