1 files changed, 5 insertions, 2 deletions
diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala
index 75e25062ca..648aa5993a 100644
--- a/src/library/scala/util/parsing/json/JSON.scala
+++ b/src/library/scala/util/parsing/json/JSON.scala
@@ -74,13 +74,16 @@ object JSON extends Parser {
       case (key: String, value: List[_]) =>
         objMap = objMap.+[Any](key -> resolveType(value))
         true
-      case (key : String, value : Any) =>
+      case (key : String, value) =>
         objMap += key -> value
         true
       case _ => false
     }) objMap
     else
-      input
+      input.map {
+          case l : List[_] => resolveType(l)
+          case x => x
+      }
   }
 
   /**