diff --git a/src/helma/scripting/fesi/FesiActionAdapter.java b/src/helma/scripting/fesi/FesiActionAdapter.java
index 6051a4be..d17e5b11 100644
--- a/src/helma/scripting/fesi/FesiActionAdapter.java
+++ b/src/helma/scripting/fesi/FesiActionAdapter.java
@@ -57,7 +57,7 @@ public class FesiActionAdapter {
 
         Reader reader = null;
 
-        functionName = action.getFunctionName();
+        functionName = action.getFunctionName().replace('.', '_');
         sourceName = action.getSourceName();
 
         try {
diff --git a/src/helma/scripting/fesi/FesiEngine.java b/src/helma/scripting/fesi/FesiEngine.java
index f1fd7524..20360944 100644
--- a/src/helma/scripting/fesi/FesiEngine.java
+++ b/src/helma/scripting/fesi/FesiEngine.java
@@ -505,6 +505,8 @@ public class FesiEngine implements ScriptingEngine {
                 }
             }
 
+            functionName = functionName.replace('.', '_');
+
             ESValue retval = eso.doIndirectCall(evaluator, eso, functionName, esv);
 
             if (xmlrpc) {
@@ -572,6 +574,9 @@ public class FesiEngine implements ScriptingEngine {
                 return false;
             }
 
+            // replace '.' with '_' in function name
+            fname = fname.replace('.', '_');
+
             ESValue func = op.getProperty(fname, fname.hashCode());
 
             if ((func != null) && func instanceof FunctionPrototype) {