diff --git a/configure.py b/configure.py
index 5f300a87..8f7f1f94 100755
--- a/configure.py
+++ b/configure.py
@@ -204,7 +204,7 @@ LIBS = [
             ["MetroidPrime/BodyState/CBSSlide", False],
             "MetroidPrime/BodyState/CBSHurled",
             "MetroidPrime/BodyState/CBSJump",
-            ["MetroidPrime/BodyState/CBSGenerate", False],
+            ["MetroidPrime/BodyState/CBSGenerate", True],
             "MetroidPrime/Enemies/CPuddleSpore",
             "MetroidPrime/BodyState/CBSTaunt",
             "MetroidPrime/CSortedLists",
diff --git a/obj_files.mk b/obj_files.mk
index 7b36097f..23cea8f0 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -169,7 +169,7 @@ METROIDPRIME :=\
 	$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSSlide.o\
 	$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSHurled.o\
 	$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSJump.o\
-	$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSGenerate.o\
+	$(BUILD_DIR)/src/MetroidPrime/BodyState/CBSGenerate.o\
 	$(BUILD_DIR)/asm/MetroidPrime/Enemies/CPuddleSpore.o\
 	$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSTaunt.o\
 	$(BUILD_DIR)/asm/MetroidPrime/CSortedLists.o\
diff --git a/src/MetroidPrime/BodyState/CBSGenerate.cpp b/src/MetroidPrime/BodyState/CBSGenerate.cpp
index d05716f5..437570aa 100644
--- a/src/MetroidPrime/BodyState/CBSGenerate.cpp
+++ b/src/MetroidPrime/BodyState/CBSGenerate.cpp
@@ -40,8 +40,9 @@ pas::EAnimationState CBSGenerate::UpdateBody(float dt, CBodyController& bc,
                                              CStateManager& mgr) override {
   const pas::EAnimationState st = GetBodyStateTransition(dt, bc);
   if (st == pas::kAS_Invalid) {
-    if (bc.GetCommandMgr().GetTargetVector().IsNonZero()) {
-      bc.FaceDirection(bc.GetCommandMgr().GetTargetVector(), dt);
+    CBodyStateCmdMgr& commandMgr = bc.CommandMgr();
+    if (commandMgr.GetTargetVector().IsNonZero()) {
+      bc.FaceDirection(commandMgr.GetTargetVector(), dt);
     }
   }
   return st;