diff --git a/src/deobfuscator.js b/src/deobfuscator.js
index 42184de..e201696 100644
--- a/src/deobfuscator.js
+++ b/src/deobfuscator.js
@@ -2,7 +2,6 @@ import { transform } from "@babel/core";
 import { changed, setChanged } from "./utils/util.js";
 import removeDeadCode from "./techniques/statics/remove-dead-code.js";
 import renameVariableSameScope from "./techniques/statics/rename-variable-same-scope.js";
-import replaceFunctionExpressionWithFunctionDeclaration from "./techniques/statics/replace-function-expression-with-function-declaration.js";
 import reconstructVariableDeclaration from "./techniques/statics/reconstruct-variable-declaration.js";
 import constantPropagation from "./techniques/statics/constant-propagation.js";
 import evaluate from "./techniques/statics/evaluate.js";
@@ -26,7 +25,6 @@ export default function deobfuscate(code, dynamic = false) {
       plugins: [
         removeDeadCode,
         renameVariableSameScope,
-        replaceFunctionExpressionWithFunctionDeclaration,
         reconstructVariableDeclaration,
         constantPropagation,
         evaluate,
diff --git a/src/techniques/dynamics/evaluate-function.js b/src/techniques/dynamics/evaluate-function.js
index 71a3d9e..550aa2b 100644
--- a/src/techniques/dynamics/evaluate-function.js
+++ b/src/techniques/dynamics/evaluate-function.js
@@ -3,29 +3,36 @@ import _generate from "@babel/generator";
 const generate = _generate.default;
 import vm from "vm";
 
-const context = vm.createContext();
-var functionName;
-
 export default function (babel) {
   const { types: t } = babel;
+  const context = vm.createContext();
 
   return {
     name: "evaluate-function",
     visitor: {
-      FunctionDeclaration(path) {
-        const { node } = path;
-        functionName = node.id.name;
-        const func = generate(node).code;
-        vm.runInContext(func, context);
+      FunctionDeclaration: {
+        enter(path) {
+          const { node } = path;
+          const func = generate(node).code;
+          vm.runInContext(func, context);
+        },
+      },
+      VariableDeclarator: {
+        enter(path) {
+          const { node } = path;
+          const { init } = node;
+          if (t.isArrowFunctionExpression(init)) {
+            vm.runInContext(generate(node).code, context);
+          }
+        },
       },
       CallExpression(path) {
         const { node } = path;
         const { callee } = node;
-        if (callee.name !== functionName) return;
+        if (!context.hasOwnProperty(callee.name)) return;
         const args = node.arguments;
         if (!args.every(arg => t.isLiteral(arg))) return;
-        const expressionCode = generate(node).code;
-        const value = vm.runInContext(expressionCode, context);
+        const value = vm.runInContext(generate(node).code, context);
         if (value) {
           path.replaceWith(t.valueToNode(value));
           setChanged(true);
diff --git a/test/test-dynamic-techniques.js b/test/test-dynamic-techniques.js
index e021b39..e7111b2 100644
--- a/test/test-dynamic-techniques.js
+++ b/test/test-dynamic-techniques.js
@@ -1,4 +1,4 @@
-import { test, describe } from "node:test";
+import { test } from "node:test";
 import assert from "node:assert/strict";
 
 import deobfuscate from "../src/deobfuscator.js";
@@ -21,3 +21,33 @@ test("evaluation of functions with literal node type as inputs", () => {
     `console.log(4);`
   );
 });
+
+test("evaluation of arrow functions with literal node type as inputs and implicit return", () => {
+  assert.strictEqual(
+    removeNewLinesAndTabs(
+      deobfuscate(
+        `
+        let sum = (a,b) => a + b;
+        console.log(sum(2,2));
+        `,
+        true
+      )
+    ),
+    `console.log(4);`
+  );
+});
+
+test("evaluation of arrow functions with literal node type as inputs", () => {
+  assert.strictEqual(
+    removeNewLinesAndTabs(
+      deobfuscate(
+        `
+        let sub = (a,b) => {return a - b;};
+        console.log(sub(4,2));
+        `,
+        true
+      )
+    ),
+    `console.log(2);`
+  );
+});
diff --git a/test/test-static-techniques.js b/test/test-static-techniques.js
index 1618fe3..c4e36e2 100644
--- a/test/test-static-techniques.js
+++ b/test/test-static-techniques.js
@@ -5,24 +5,6 @@ import deobfuscate from "../src/deobfuscator.js";
 
 import { removeNewLinesAndTabs } from "../src/utils/util.js";
 
-test("transform function expressions into function declarations", () => {
-  assert.strictEqual(
-    removeNewLinesAndTabs(
-      deobfuscate(
-        `
-        var sum = function(a, b) {
-          return a + b;
-        }
-        var a = 2;
-        console.log(sum(a, 2*a));
-      `,
-        false
-      )
-    ),
-    `function sum(a, b) { return a + b; } console.log(sum(2, 4));`
-  );
-});
-
 test("reconstruct variable declarations", () => {
   assert.strictEqual(
     removeNewLinesAndTabs(