diff --git a/UMAProject/Assets/Standard Assets/UMA/Core/Scripts/UMAMeshData.cs b/UMAProject/Assets/Standard Assets/UMA/Core/Scripts/UMAMeshData.cs
index 1a4c9b5f..be64186b 100644
--- a/UMAProject/Assets/Standard Assets/UMA/Core/Scripts/UMAMeshData.cs	
+++ b/UMAProject/Assets/Standard Assets/UMA/Core/Scripts/UMAMeshData.cs	
@@ -319,6 +319,18 @@ public void PrepareVertexBuffers(int size)
 #endif
 		}
 		
+		/// <summary>
+		/// Initialize UMA mesh data from Unity mesh.
+		/// </summary>
+		/// <param name="renderer">Source renderer.</param>
+		public void RetrieveDataFromUnityMesh(SkinnedMeshRenderer renderer)
+		{
+			RetrieveDataFromUnityMesh(renderer.sharedMesh);
+
+			UpdateBones(renderer.rootBone, renderer.bones);
+		}
+
+		
 		/// <summary>
 		/// Initialize UMA mesh data from Unity mesh.
 		/// </summary>
@@ -346,17 +358,6 @@ public void RetrieveDataFromUnityMesh(Mesh sharedMesh)
 			}
 		}
 
-		/// <summary>
-		/// Initialize UMA mesh data from Unity mesh.
-		/// </summary>
-		/// <param name="renderer">Source renderer.</param>
-		public void RetrieveDataFromUnityMesh(SkinnedMeshRenderer renderer)
-				{
-			RetrieveDataFromUnityMesh(renderer.sharedMesh);
-
-			UpdateBones(renderer.rootBone, renderer.bones);
-		}
-
 		/// <summary>
 		/// Validates the skinned transform hierarchy.
 		/// </summary>
@@ -364,13 +365,13 @@ public void RetrieveDataFromUnityMesh(SkinnedMeshRenderer renderer)
 		/// <param name="bones">Transforms.</param>
 		public void UpdateBones(Transform rootBone, Transform[] bones)
 		{
-			var storedRoot  = rootBone;
+			var storedRootBone = rootBone;
 			while (rootBone.name != "Global")
 			{
 				rootBone = rootBone.parent;
 				if (rootBone == null)
 				{
-					rootBone = storedRoot;
+					rootBone = storedRootBone;
 					break;
 				}
 			}
@@ -456,7 +457,7 @@ public void ApplyDataToUnityMesh(SkinnedMeshRenderer renderer, UMASkeleton skele
 			}
 
 			mesh.RecalculateBounds();
-			renderer.bones = bones;// skeleton.HashesToTransforms(boneNameHashes);
+			renderer.bones = bones != null ? bones : skeleton.HashesToTransforms(boneNameHashes);
 			renderer.sharedMesh = mesh;
 			renderer.rootBone = rootBone;
 		}