diff --git a/exec/loadfont.js b/exec/loadfont.js
index f79468dfd694daefb0c8476112b959f63631a899..7471abded6d83138d2662837edcdf25fdce1fdcc 100644
--- a/exec/loadfont.js
+++ b/exec/loadfont.js
@@ -8,8 +8,9 @@
  */
 
 load("sbbsdefs.js");
+if(this.CTerm_Version==undefined)
+	js.global.CTerm_Version=null;
 loadfont();
-var CTerm_Version;
 
 function loadfont()
 {
@@ -34,7 +35,10 @@ function loadfont()
 			}
 		}
 		else {
-			filenames.push(argv[i].toString());
+			if(argv[i].constructor==Array)
+				filenames=filenames.concat(argv[i]);
+			else
+				filenames.push(argv[i].toString());
 		}
 	}
 
@@ -67,7 +71,7 @@ function loadfont()
 
 	// Check if it's CTerm and supports font loading...
 	var ver=new Array(0,0);
-	if(CTerm_Version == undefined) {
+	if(CTerm_Version == undefined || CTerm_Version == null) {
 		// Disable parsed input... we need to do ESC processing ourselves here.
 		var oldctrl=console.ctrlkey_passthru;
 		console.ctrlkey_passthru=-1;
diff --git a/exec/pickfont.js b/exec/pickfont.js
index b76cb2eaaa2c754285802543d8b48bf30528c405..24062fda97a38287562cffcf57112bab4364cd8c 100644
--- a/exec/pickfont.js
+++ b/exec/pickfont.js
@@ -2,8 +2,9 @@
 // Pass the desired fotn slot on the command line
 // If nothing passed, changes to font 0 (CP437)
 
+if(this.CTerm_Version==undefined)
+	js.global.CTerm_Version=null;
 pickfont();
-var CTerm_Version;
 
 function pickfont()
 {
@@ -21,7 +22,7 @@ function pickfont()
 
 	// Check if it's CTerm and supports font loading...
 	var ver=new Array(0,0);
-	if(CTerm_Version==undefined) {
+	if(CTerm_Version==undefined || CTerm_Version==null) {
 		if(detect) {
 			// Disable parsed input... we need to do ESC processing ourselves here.
 			var oldctrl=console.ctrlkey_passthru;