diff --git a/spine-tk2d/Assets/Spine/SkeletonComponent.cs b/spine-tk2d/Assets/Spine/SkeletonComponent.cs
index 4f9925d70..1b0eabbfb 100644
--- a/spine-tk2d/Assets/Spine/SkeletonComponent.cs
+++ b/spine-tk2d/Assets/Spine/SkeletonComponent.cs
@@ -272,7 +272,14 @@ public class SkeletonComponent : MonoBehaviour {
 			submesh.indexes = indexes = new int[indexCount];
 			submesh.indexCount = 0;
 		}
-		
+
+		// Last submesh may have more indices than required, so zero indexes to the end.
+		if (lastSubmesh && submesh.indexCount != indexCount) {
+			submesh.indexCount = indexCount;
+			for (int i = indexCount, n = indexes.Length; i < n; i++)
+				indexes[i] = 0;
+		}
+
 		// Set indexes if not already set.
 		if (submesh.firstVertex != vertexIndex || submesh.indexCount < indexCount) {
 			submesh.indexCount = indexCount;
@@ -286,13 +293,6 @@ public class SkeletonComponent : MonoBehaviour {
 				indexes[i + 5] = vertexIndex + 1;
 			}
 		}
-
-		// Last submesh may have more indices than required, so zero indexes to the end.
-		if (lastSubmesh && submesh.indexCount != indexCount) {
-			submesh.indexCount = indexCount;
-			for (int i = indexCount, n = indexes.Length; i < n; i++)
-				indexes[i] = 0;
-		}
 	}
 	
 	public virtual void OnEnable () {
diff --git a/spine-unity/Assets/Spine/SkeletonComponent.cs b/spine-unity/Assets/Spine/SkeletonComponent.cs
index ed2ff6936..7b4021e12 100644
--- a/spine-unity/Assets/Spine/SkeletonComponent.cs
+++ b/spine-unity/Assets/Spine/SkeletonComponent.cs
@@ -265,14 +265,21 @@ public class SkeletonComponent : MonoBehaviour {
 
 		if (submeshes.Count <= submeshIndex) submeshes.Add(new Submesh());
 		Submesh submesh = submeshes[submeshIndex];
-		
+
 		// Allocate indexes if not the right size, allowing last submesh to have more than required.
 		int[] indexes = submesh.indexes;
 		if (lastSubmesh ? (indexes.Length < indexCount) : (indexes.Length != indexCount)) {
 			submesh.indexes = indexes = new int[indexCount];
 			submesh.indexCount = 0;
 		}
-		
+
+		// Last submesh may have more indices than required, so zero indexes to the end.
+		if (lastSubmesh && submesh.indexCount != indexCount) {
+			submesh.indexCount = indexCount;
+			for (int i = indexCount, n = indexes.Length; i < n; i++)
+				indexes[i] = 0;
+		}
+
 		// Set indexes if not already set.
 		if (submesh.firstVertex != vertexIndex || submesh.indexCount < indexCount) {
 			submesh.indexCount = indexCount;
@@ -286,13 +293,6 @@ public class SkeletonComponent : MonoBehaviour {
 				indexes[i + 5] = vertexIndex + 1;
 			}
 		}
-
-		// Last submesh may have more indices than required, so zero indexes to the end.
-		if (lastSubmesh && submesh.indexCount != indexCount) {
-			submesh.indexCount = indexCount;
-			for (int i = indexCount, n = indexes.Length; i < n; i++)
-				indexes[i] = 0;
-		}
 	}
 	
 	public virtual void OnEnable () {