diff --git a/SHADE_Engine/src/Editor/EditorWindow/RawAnimationInspector/SHRawAnimInspector.cpp b/SHADE_Engine/src/Editor/EditorWindow/RawAnimationInspector/SHRawAnimInspector.cpp
index 0391f75d..563c0f60 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/RawAnimationInspector/SHRawAnimInspector.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/RawAnimationInspector/SHRawAnimInspector.cpp
@@ -87,6 +87,7 @@ namespace SHADE
           animClip->name = newAssetName;
           animClip->firstIndex = firstIndex;
           animClip->lastIndex = lastIndex;
+          animClip->animRawDataAssetId = SHResourceManager::GetAssetID<SHRawAnimation>(rawAnimation).value_or(0);
           SHAssetManager::SaveAsset(containerAsset->id);
 
           // Close
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.hpp b/SHADE_Engine/src/Resource/SHResourceManager.hpp
index 85f5fd33..6474b478 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.hpp
+++ b/SHADE_Engine/src/Resource/SHResourceManager.hpp
@@ -370,7 +370,7 @@ namespace SHADE
       loadedAssetData.emplace_back(assetId);
       return resourceHub.Create<ResourceType>
       (
-        LoadOrGet<SHRawAnimation>(assetId), // TODO: Wrong, we need to grab the parent asset's ID
+        LoadOrGet<SHRawAnimation>(assetData.animRawDataAssetId),
         assetData.firstIndex,
         assetData.lastIndex
       );