diff --git a/core/src/main/java/resource/context/admin/debug/Modern.cfc b/core/src/main/java/resource/context/admin/debug/Modern.cfc
index 4fab2afdb7..1689b922f2 100644
--- a/core/src/main/java/resource/context/admin/debug/Modern.cfc
+++ b/core/src/main/java/resource/context/admin/debug/Modern.cfc
@@ -162,8 +162,10 @@ if(structKeyExists(arguments.custom, "metrics_Charts")) {
 		local.times=arguments.debugging.times;
 
 		var time=getTickCount();
-		var _cgi=structKeyExists(arguments.debugging,'cgi')?arguments.debugging.cgi:cgi;
-		
+		// CGI
+		if(!isNull(arguments.debugging.scope.cgi)) local._cgi=arguments.debugging.scope.cgi;
+		else if(!isNull(arguments.debugging.cgi)) local._cgi=arguments.debugging.cgi; 
+		else local._cgi=cgi;
 		
 		
 
diff --git a/loader/build.xml b/loader/build.xml
index 018e0c871e..a61f865ec8 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.1.1.79-RC"/>
+  <property name="version" value="6.1.1.80-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 774ac0da32..be1a930f7b 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.1.79-RC</version>
+  <version>6.1.1.80-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>