diff --git a/DataSpec/DNAMP1/ANCS.cpp b/DataSpec/DNAMP1/ANCS.cpp
index a3bec9ba7..a08658eec 100644
--- a/DataSpec/DNAMP1/ANCS.cpp
+++ b/DataSpec/DNAMP1/ANCS.cpp
@@ -1364,14 +1364,19 @@ bool ANCS::CookANIM(const hecl::ProjectPath& outPath,
 
     /* Build bone ID map */
     std::unordered_map<std::string, atInt32> boneIdMap;
+    std::experimental::optional<CINF> rigCinf;
     std::experimental::optional<DNAANIM::RigInverter<CINF>> rigInv;
     for (const DNAANCS::Actor::Armature& arm : actor.armatures)
     {
-        CINF cinf(arm, boneIdMap);
         if (!rigInv)
         {
+            rigCinf.emplace(arm, boneIdMap);
             auto matrices = ds.getBoneMatrices(arm.name);
-            rigInv.emplace(cinf, matrices);
+            rigInv.emplace(*rigCinf, matrices);
+        }
+        else
+        {
+            CINF cinf(arm, boneIdMap);
         }
     }
 
diff --git a/amuse b/amuse
index 3eba4cc1a..4c2a26247 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit 3eba4cc1ac7cf08c23107302807e6d1adf9087db
+Subproject commit 4c2a26247886fd6b0baaef37d57b6c4ad78bf42b
diff --git a/hecl b/hecl
index fac818d9a..caf9749c1 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit fac818d9a0b4cf41934cb9b7f780fe87cafba293
+Subproject commit caf9749c101cde38bf0971d8afca5e3b62a98579