diff --git a/src/main/java/com/Acrobot/Breeze/Database/EntityParser.java b/src/main/java/com/Acrobot/Breeze/Database/EntityParser.java
index 7bd0a17..b96cf7e 100644
--- a/src/main/java/com/Acrobot/Breeze/Database/EntityParser.java
+++ b/src/main/java/com/Acrobot/Breeze/Database/EntityParser.java
@@ -36,7 +36,7 @@ public class EntityParser {
             fields.add(convertToSQL(field));
         }
 
-        return fields.stream().collect(Collectors.joining(","));
+        return String.join(",", fields);
     }
 
     /**
diff --git a/src/main/java/com/Acrobot/Breeze/Database/Table.java b/src/main/java/com/Acrobot/Breeze/Database/Table.java
index f1f969c..a16e8f2 100644
--- a/src/main/java/com/Acrobot/Breeze/Database/Table.java
+++ b/src/main/java/com/Acrobot/Breeze/Database/Table.java
@@ -132,7 +132,7 @@ public class Table {
         String statement;
 
         if (condition == null || condition.isEmpty()) {
-            String format = '\'' + row.getValues().stream().collect(Collectors.joining("', ")) + '\'';
+            String format = '\'' + String.join("', ", row.getValues()) + '\'';
             statement = String.format(INSERT_VALUES, format);
         } else {
             String format = row.getKeysAndValues().entrySet().stream()