diff --git a/include/Animation/AnimationController.h b/include/Animation/AnimationController.h
index 6a24c7e..769aa61 100644
--- a/include/Animation/AnimationController.h
+++ b/include/Animation/AnimationController.h
@@ -52,7 +52,7 @@ class AnimationController
             return !m_animation || (m_animation->finished() && !m_nextAnimation);
         }
 
-        uint32_t currentFrame(void) { return m_frame; }
+        uint64_t currentFrame(void) { return m_frame; }
         AnimationInitiator animationInitiator(void) { return m_animationInitiator; }
         DefaultAnimation lastDefaultAnimation(void) { return m_lastDefaultAnimation; }
 
diff --git a/src/Animation/AnimationController.cpp b/src/Animation/AnimationController.cpp
index f305bd6..19c3d2f 100644
--- a/src/Animation/AnimationController.cpp
+++ b/src/Animation/AnimationController.cpp
@@ -30,6 +30,8 @@ void AnimationController::changeAnimation(std::unique_ptr<Animation> anim, bool
         m_nextAnimation.reset(nullptr);
     }
 
+    m_animationInitiator = animInitiator;
+
     xSemaphoreGive(m_updateMutex);
 }