diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d0f82498d1fc14d33c97938e7602db7e545636a..1ef9b889db93f0d1ea5d2692b4b4148cb7955ca5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1]
+
+### Fixed
+- Action animation frames overflow
+
 ## [0.2.0]
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index 8f78a350cd86c2b24f04c43e9460ca445f56e69e..0a4864cee41f0f618ae3bd477dd402fcc1ddf89b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "micro_banimate"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 license = "Apache-2.0"
 description = "Easily manage complex Bevy 2D sprite animations"
diff --git a/src/query.rs b/src/query.rs
index b18d1aee32c189499e42c27b0ce6677b17d423ae..f9bce484485ea07462d12dc1a0728496f0e8d201 100644
--- a/src/query.rs
+++ b/src/query.rs
@@ -285,6 +285,7 @@ impl<'w, 's> AnimationQuery<'w, 's> {
 						entity,
 						user_data: status.user_data,
 					});
+					status.frame_step = current.frames.len() - 1;
 				}
 
 				if let Ok(mut sprite) = self.tile_sprite.get_mut(entity) {