diff --git a/src/model/CM2Model.cpp b/src/model/CM2Model.cpp
index 0619f49..8c2e103 100644
--- a/src/model/CM2Model.cpp
+++ b/src/model/CM2Model.cpp
@@ -980,7 +980,7 @@ int32_t CM2Model::InitializeLoaded() {
             new (&this->m_attachments[i]) M2ModelAttachment();
 
             auto& modelAttachment = this->m_attachments[i];
-            modelAttachment.visible = true;
+            modelAttachment.visibilityTrack.currentValue = 1;
         }
     }
 
diff --git a/src/model/M2Model.hpp b/src/model/M2Model.hpp
index f99d1b9..ab2f98a 100644
--- a/src/model/M2Model.hpp
+++ b/src/model/M2Model.hpp
@@ -20,9 +20,7 @@ struct M2ModelTrack {
 };
 
 struct M2ModelAttachment {
-    CM2Model* model = nullptr;
-    int32_t linkPoint = 0;
-    bool visible = false;
+    M2ModelTrack<uint8_t> visibilityTrack;
 };
 
 struct M2ModelBoneSeq {