diff --git a/core/src/main/java/lucee/runtime/type/KeyImpl.java b/core/src/main/java/lucee/runtime/type/KeyImpl.java
index b4e26796f4..bc1a526b6c 100755
--- a/core/src/main/java/lucee/runtime/type/KeyImpl.java
+++ b/core/src/main/java/lucee/runtime/type/KeyImpl.java
@@ -190,6 +190,7 @@ public static Collection.Key init(String key) {
 	 * used to inside the rest of the source created, can be dynamic values, so a lot
 	 */
 	public static Collection.Key source(String key) {
+		if (MAX == 0) return new KeyImpl(key);
 		Key k = keys.get(key);
 		if (k == null) {
 			if (keys.size() > MAX) return new KeyImpl(key);
diff --git a/loader/build.xml b/loader/build.xml
index f260b04f29..368eb1ff4e 100644
--- a/loader/build.xml
+++ b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.214-SNAPSHOT"/>
+  <property name="version" value="6.2.0.215-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>
diff --git a/loader/pom.xml b/loader/pom.xml
index 9b8a66aa29..afb45f6be9 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.214-SNAPSHOT</version>
+  <version>6.2.0.215-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>