diff --git a/config/clients.config.json b/config/clients.config.json
index eed920953d..d65fabb514 100644
--- a/config/clients.config.json
+++ b/config/clients.config.json
@@ -88,7 +88,7 @@
     "folder": "clients/algoliasearch-client-scala",
     "gitRepoId": "algoliasearch-client-scala",
     "packageVersion": "2.0.0-alpha.1",
-    "modelFolder": "src/main/scala/algoliasearch/model",
+    "modelFolder": "src/main/scala/algoliasearch",
     "apiFolder": "src/main/scala/algoliasearch/api",
     "customGenerator": "algolia-scala",
     "tests": {
@@ -96,4 +96,4 @@
       "outputFolder": "test"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/templates/java/oneof_interface.mustache b/templates/java/oneof_interface.mustache
index 179716a16c..6cb64ccc2d 100644
--- a/templates/java/oneof_interface.mustache
+++ b/templates/java/oneof_interface.mustache
@@ -101,7 +101,7 @@ public interface {{classname}} {
                     return new {{classname}}.{{{datatypeWithEnum}}}Wrapper(value);
                     {{/isMap}}{{/isArray}}{{/isEnumRef}}{{/isModel}}
                     {{#isMap}}
-                    {{{datatypeWithEnum}}} value = parser.readValueAs({{#lambda.type-to-name}}{{{datatypeWithEnum}}}{{/lambda.type-to-name}}.class);
+                    {{{datatypeWithEnum}}} value = parser.readValueAs(new TypeReference<{{{datatypeWithEnum}}}>(){});
                     return new {{classname}}.{{#lambda.type-to-name}}{{{datatypeWithEnum}}}{{/lambda.type-to-name}}Wrapper(value);
                     {{/isMap}}
                 } catch (Exception e) {