diff --git a/src/main/java/carpet/script/language/DataStructures.java b/src/main/java/carpet/script/language/DataStructures.java
index 90d02d99..59418de5 100644
--- a/src/main/java/carpet/script/language/DataStructures.java
+++ b/src/main/java/carpet/script/language/DataStructures.java
@@ -57,7 +57,7 @@ public class DataStructures {
             if (lv.size() == 1)
             {
                 hwat = lv.get(0);
-                delimiter = StringValue.EMPTY;
+                delimiter = null;
             }
             else if (lv.size() == 2)
             {
diff --git a/src/main/java/carpet/script/value/ListValue.java b/src/main/java/carpet/script/value/ListValue.java
index c3b23438..d5662d11 100644
--- a/src/main/java/carpet/script/value/ListValue.java
+++ b/src/main/java/carpet/script/value/ListValue.java
@@ -355,7 +355,7 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
         for (Value val : this.items)
         {
             index++;
-            if (val.equals(delimiter))
+            if (val.equals(delimiter) || delimiter == null)
             {
                 result.items.add(ListValue.wrap(this.items.subList(startIndex, index-1)));
                 startIndex = index;
diff --git a/src/main/java/carpet/script/value/Value.java b/src/main/java/carpet/script/value/Value.java
index b9ac965c..5f228c7d 100644
--- a/src/main/java/carpet/script/value/Value.java
+++ b/src/main/java/carpet/script/value/Value.java
@@ -193,7 +193,11 @@ public abstract class Value implements Comparable<Value>, Cloneable
     
     public Value split(Value delimiter)
     {
-    	try
+        if (delimiter == null)
+        {
+            delimiter = StringValue.EMPTY;
+        }
+        try
         {
             return ListValue.wrap(Arrays.stream(getString().split(delimiter.getString())).map(StringValue::new).collect(Collectors.toList()));
         }