diff --git a/core/src/main/java/resource/context/admin/debug/Classic.cfc b/core/src/main/java/resource/context/admin/debug/Classic.cfc
index d39dbf1633..020a0d8800 100644
--- a/core/src/main/java/resource/context/admin/debug/Classic.cfc
+++ b/core/src/main/java/resource/context/admin/debug/Classic.cfc
@@ -83,7 +83,9 @@ private function isColumnEmpty(query query, string columnName){
 		<cfargument name="context" type="string" default="web"><cfsilent>
 <cfscript>
 	var time=getTickCount();
-	var _cgi = arguments?.debugging?.scope?.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;
 
 	if(isNull(arguments.debugging.pages)) 
 		local.pages=queryNew('id,count,min,max,avg,app,load,query,total,src');
diff --git a/core/src/main/java/resource/context/admin/debug/Comment.cfc b/core/src/main/java/resource/context/admin/debug/Comment.cfc
index 3ac05b567e..97b1972685 100644
--- a/core/src/main/java/resource/context/admin/debug/Comment.cfc
+++ b/core/src/main/java/resource/context/admin/debug/Comment.cfc
@@ -56,7 +56,9 @@
 		*/
 		function output(struct custom, struct debugging, string context="web") {
 			var NL=variables.NL;
-			var _cgi = arguments?.debugging?.scope?.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;
 			if (not StructKeyExists(arguments.custom, "unit"))
 				 arguments.custom["unit"] = "millisecond";
 			writeOutput("<!--"&NL);
diff --git a/core/src/main/java/resource/context/admin/debug/Simple.cfc b/core/src/main/java/resource/context/admin/debug/Simple.cfc
index ac06173b43..37e6be63c5 100644
--- a/core/src/main/java/resource/context/admin/debug/Simple.cfc
+++ b/core/src/main/java/resource/context/admin/debug/Simple.cfc
@@ -102,8 +102,11 @@
 		<cfif !structKeyExists(arguments.custom,'general')><cfset arguments.custom.general="Enabled"></cfif>
 
 		<cfset var time=getTickCount() />
-		<cfset var _cgi=structKeyExists(arguments.debugging,'cgi')?arguments.debugging.cgi:cgi />
 		<cfscript>
+			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;
+		
 			if(isNull(arguments.debugging.pages)) 
 				local.pages=queryNew('id,count,min,max,avg,app,load,query,total,src');
 			else local.pages=arguments.debugging.pages;