diff --git a/data/v2/build.py b/data/v2/build.py
index a4f8d543b..583d454fa 100644
--- a/data/v2/build.py
+++ b/data/v2/build.py
@@ -118,7 +118,11 @@ def scrub_str(string):
         if group[0]:
             sub = group[0]
         else:
-            sub = group[1].split(":")[1]
+            sub = group[1].split(":")
+            if len(sub) >= 2:
+                sub = sub[1]
+            else:
+                sub = sub[0]
             sub = sub.replace("-", " ")
         string = re.sub(SUB_RGX, sub, string, 1)
     return string
diff --git a/pokemon_v2/migrations/0004_iso639length_20191217.py b/pokemon_v2/migrations/0004_iso639length_20191217.py
new file mode 100644
index 000000000..3d81baf2b
--- /dev/null
+++ b/pokemon_v2/migrations/0004_iso639length_20191217.py
@@ -0,0 +1,18 @@
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pokemon_v2', '0003_auto_20160530_1132'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='language',
+            name='iso639',
+            field=models.CharField(max_length=10),
+            preserve_default=True,
+        ),
+        
+    ]
diff --git a/pokemon_v2/models.py b/pokemon_v2/models.py
index 9496b1511..dc93eb49d 100755
--- a/pokemon_v2/models.py
+++ b/pokemon_v2/models.py
@@ -499,7 +499,7 @@ class VersionGroupMoveLearnMethod(HasVersionGroup, HasMoveLearnMethod):
 
 class Language(HasName, HasOrder):
 
-    iso639 = models.CharField(max_length=2)
+    iso639 = models.CharField(max_length=10)
 
     iso3166 = models.CharField(max_length=2)