diff --git a/source/java/org/alfresco/web/forms/FormDataFunctions.java b/source/java/org/alfresco/web/forms/FormDataFunctions.java
index a6a7e3cbcc..90629956e6 100644
--- a/source/java/org/alfresco/web/forms/FormDataFunctions.java
+++ b/source/java/org/alfresco/web/forms/FormDataFunctions.java
@@ -62,9 +62,7 @@ public class FormDataFunctions
       SAXException
    {
       final DocumentBuilder db = this.getDocumentBuilder();
-      final InputStream istream = 
-         new AVMRemoteInputStream(this.avmRemote.getInputHandle(-1, avmPath), 
-                                  this.avmRemote);
+      final InputStream istream = this.avmRemote.getFileInputStream(-1, avmPath); 
 
       Document result;
       try 
@@ -120,10 +118,7 @@ public class FormDataFunctions
                // it's generated by a rendering engine (it's not the xml file)
                continue;
             }
-            
-            final InputStream istream =
-               new AVMRemoteInputStream(this.avmRemote.getInputHandle(-1, avmPath + '/' + entryName), 
-                                        this.avmRemote);
+            final InputStream istream = this.avmRemote.getFileInputStream(-1, avmPath + '/' + entryName);
             try
             {
                result.put(entryName, db.parse(istream));