diff --git a/tools/server/public_simplechat/tooljs.mjs b/tools/server/public_simplechat/tooljs.mjs
index c2bbc0c43c..dfaab85009 100644
--- a/tools/server/public_simplechat/tooljs.mjs
+++ b/tools/server/public_simplechat/tooljs.mjs
@@ -63,14 +63,15 @@ let js_meta = {
 /**
  * Implementation of the javascript interpretor logic. Minimal skeleton for now.
  * ALERT: Has access to the javascript environment and can mess with it and beyond
+ * @param {string} toolname
  * @param {any} obj
  */
-function js_run(obj) {
+function js_run(toolname, obj) {
     console_redir()
     let func = new Function(obj["code"])
     func()
     console_revert()
-    tc_switch["javascript"]["result"] = gConsoleStr
+    tc_switch[toolname]["result"] = gConsoleStr
 }
 
 
@@ -96,14 +97,15 @@ let calc_meta = {
 /**
  * Implementation of the simple calculator logic. Minimal skeleton for now.
  * ALERT: Has access to the javascript environment and can mess with it and beyond
+ * @param {string} toolname
  * @param {any} obj
  */
-function calc_run(obj) {
+function calc_run(toolname, obj) {
     console_redir()
     let func = new Function(`console.log(${obj["arithexpr"]})`)
     func()
     console_revert()
-    tc_switch["simple_calculator"]["result"] = gConsoleStr
+    tc_switch[toolname]["result"] = gConsoleStr
 }
 
 
diff --git a/tools/server/public_simplechat/tools.mjs b/tools/server/public_simplechat/tools.mjs
index 686d47a241..d75d3eb7bf 100644
--- a/tools/server/public_simplechat/tools.mjs
+++ b/tools/server/public_simplechat/tools.mjs
@@ -37,7 +37,7 @@ export async function tool_call(toolname, toolargs) {
     for (const fn in tc_switch) {
         if (fn == toolname) {
             try {
-                tc_switch[fn]["handler"](JSON.parse(toolargs))
+                tc_switch[fn]["handler"](fn, JSON.parse(toolargs))
                 return tc_switch[fn]["result"]
             } catch (/** @type {any} */error) {
                 return `Tool/Function call raised an exception:${error.name}:${error.message}`