diff --git a/utils/java-util.go b/utils/java-util.go
index 3aac4ba..3c9a355 100644
--- a/utils/java-util.go
+++ b/utils/java-util.go
@@ -374,7 +374,7 @@ func JavaType(reg rdl.TypeRegistry, rdlType rdl.TypeRef, optional bool, items rd
 				i = items
 			}
 		}
-		gitems := JavaType(reg, i, false, "", "")
+		gitems := JavaType(reg, i, true, "", "")
 		//return gitems + "[]" //if arrays, not lists
 		return "List<" + gitems + ">"
 	case rdl.BaseTypeMap:
@@ -392,8 +392,8 @@ func JavaType(reg rdl.TypeRegistry, rdlType rdl.TypeRef, optional bool, items rd
 				i = items
 			}
 		}
-		gkeys := JavaType(reg, k, false, "", "")
-		gitems := JavaType(reg, i, false, "", "")
+		gkeys := JavaType(reg, k, true, "", "")
+		gitems := JavaType(reg, i, true, "", "")
 		return "Map<" + gkeys + "," + gitems + ">"
 	case rdl.BaseTypeStruct:
 		switch t.Variant {