diff --git a/java/src/com/android/i18n/addressinput/ClientData.java b/java/src/com/android/i18n/addressinput/ClientData.java
index 72be34f..f0b2fc0 100644
--- a/java/src/com/android/i18n/addressinput/ClientData.java
+++ b/java/src/com/android/i18n/addressinput/ClientData.java
@@ -264,11 +264,9 @@
 
             if (map.containsKey(subMores)) {
                 // This key could have sub keys.
-                String[] mores = {};
+                String[] mores = map.get(subMores).split("~");
                 String[] keys = {};
 
-                mores = map.get(subMores).split("~");
-
                 if (map.containsKey(subKeys)) {
                     keys = map.get(subKeys).split("~");
                 }