diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index 91a1144..caa92db 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -162,6 +162,11 @@ public class JavaParser extends Parser<JavaElement> {
 		type_generic_named_super.then(type_generic_end);
 		type_generic_named_super.then(type_generic_split);
 		
+		StateTree<JavaElement> type_array_begin = type_.then((validator) -> validator.validate((token) -> token.getValue().equals("[")));
+		StateTree<JavaElement> type_array_end = type_array_begin.then((validator) -> validator.validate((token) -> token.getValue().equals("]")));
+		type_array_end.then(type_array_begin);
+		type_array_end.end();
+		
 		type_.end();
 		type_generic_end.end();
 		
diff --git a/test/be/jeffcheasey88/peeratcode/parser/java/TypeTests.java b/test/be/jeffcheasey88/peeratcode/parser/java/TypeTests.java
index e5659a7..ce6a4ee 100644
--- a/test/be/jeffcheasey88/peeratcode/parser/java/TypeTests.java
+++ b/test/be/jeffcheasey88/peeratcode/parser/java/TypeTests.java
@@ -62,6 +62,11 @@ public class TypeTests{
 		type_generic_named_super.then(type_generic_end);
 		type_generic_named_super.then(type_generic_split);
 		
+		StateTree<JavaElement> type_array_begin = type_.then((validator) -> validator.validate((token) -> token.getValue().equals("[")));
+		StateTree<JavaElement> type_array_end = type_array_begin.then((validator) -> validator.validate((token) -> token.getValue().equals("]")));
+		type_array_end.then(type_array_begin);
+		type_array_end.end();
+		
 		type_.end();
 		type_generic_end.end();
 	}
diff --git a/test/be/jeffcheasey88/peeratcode/parser/java/VariableTests.java b/test/be/jeffcheasey88/peeratcode/parser/java/VariableTests.java
index 68aadc9..42221d2 100644
--- a/test/be/jeffcheasey88/peeratcode/parser/java/VariableTests.java
+++ b/test/be/jeffcheasey88/peeratcode/parser/java/VariableTests.java
@@ -50,6 +50,7 @@ public class VariableTests{
 					bag.set("last", token);
 					map.put(token, null);
 				}));
+		
 		variable_name.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
 			.end(variable_builder);
 		StateTree<JavaElement> variable_split = variable_name.then((validator) -> validator.validate((token) -> token.getValue().equals(",")));
@@ -89,6 +90,6 @@ public class VariableTests{
 
 	@Test
 	void hashMap() throws Exception{
-		JavaElement result = testCase("private static final Map<Map<List<String>>> map = new HashMap<>();");
+		JavaElement result = testCase("private static final Map<Map<List<String[]>>> map = new HashMap<>();");
 	}
 }