diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
index a2dd4492ed1..787191e49e4 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
@@ -27,6 +27,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -460,7 +461,14 @@ public class MultiPartFilter implements Filter
         @Override
         public Map getParameterMap()
         {
-            return Collections.unmodifiableMap(_params.toStringArrayMap());
+            Map<String, String> cmap = new HashMap<String,String>();
+            
+            for ( Object key : _params.keySet() )
+            {
+                cmap.put((String)key,getParameter((String)key));
+            }
+            
+            return Collections.unmodifiableMap(cmap);
         }
         
         /* ------------------------------------------------------------------------------- */