diff --git a/src/creatures/combat/spells.hpp b/src/creatures/combat/spells.hpp
index 56ff1a330de..b50d1d5a555 100644
--- a/src/creatures/combat/spells.hpp
+++ b/src/creatures/combat/spells.hpp
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "lua/creature/actions.hpp"
-#include "creatures/players/wheel/wheel_definitions.hpp"
+#include "creatures/players/components/wheel/wheel_definitions.hpp"
 
 class InstantSpell;
 class RuneSpell;
@@ -254,8 +254,8 @@ class Spell : public BaseSpell {
 	bool pzLocked = false;
 
 	bool whellOfDestinyUpgraded = false;
-	std::array<int32_t, static_cast<uint8_t>(WheelSpellBoost_t::TOTAL_COUNT)> wheelOfDestinyRegularBoost = { 0 };
-	std::array<int32_t, static_cast<uint8_t>(WheelSpellBoost_t::TOTAL_COUNT)> wheelOfDestinyUpgradedBoost = { 0 };
+	std::array<int32_t, magic_enum::enum_count<WheelSpellBoost_t>() + 1> wheelOfDestinyRegularBoost = { 0 };
+	std::array<int32_t, magic_enum::enum_count<WheelSpellBoost_t>() + 1> wheelOfDestinyUpgradedBoost = { 0 };
 
 private:
 	uint32_t mana = 0;
diff --git a/src/creatures/players/components/wheel/player_wheel.hpp b/src/creatures/players/components/wheel/player_wheel.hpp
index cc2697e8785..072f520ad33 100644
--- a/src/creatures/players/components/wheel/player_wheel.hpp
+++ b/src/creatures/players/components/wheel/player_wheel.hpp
@@ -494,11 +494,11 @@ class PlayerWheel {
 	PlayerWheelMethodsBonusData m_playerBonusData;
 	std::unique_ptr<WheelModifierContext> m_modifierContext;
 
-	std::array<uint8_t, magic_enum::enum_count<WheelStage_t>()> m_stages = { 0 };
-	std::array<int64_t, magic_enum::enum_count<WheelOnThink_t>()> m_onThink = { 0 };
-	std::array<int32_t, magic_enum::enum_count<WheelStat_t>()> m_stats = { 0 };
-	std::array<int32_t, magic_enum::enum_count<WheelMajor_t>()> m_majorStats = { 0 };
-	std::array<bool, magic_enum::enum_count<WheelInstant_t>()> m_instant = { false };
+	std::array<uint8_t, magic_enum::enum_count<WheelStage_t>() + 1> m_stages = { 0 };
+	std::array<int64_t, magic_enum::enum_count<WheelOnThink_t>() + 1> m_onThink = { 0 };
+	std::array<int32_t, magic_enum::enum_count<WheelStat_t>() + 1> m_stats = { 0 };
+	std::array<int32_t, magic_enum::enum_count<WheelMajor_t>() + 1> m_majorStats = { 0 };
+	std::array<bool, magic_enum::enum_count<WheelInstant_t>() + 1> m_instant = { false };
 	std::array<int32_t, COMBAT_COUNT> m_resistance = { 0 };
 	std::array<int32_t, COMBAT_COUNT> m_specializedMagic = { 0 };
 
diff --git a/src/creatures/players/components/wheel/wheel_definitions.hpp b/src/creatures/players/components/wheel/wheel_definitions.hpp
index e88cb9a62df..8da01ec9b9c 100644
--- a/src/creatures/players/components/wheel/wheel_definitions.hpp
+++ b/src/creatures/players/components/wheel/wheel_definitions.hpp
@@ -180,8 +180,6 @@ enum class WheelSpellBoost_t : uint8_t {
 	HEAL = 10,
 	CRITICAL_DAMAGE = 11,
 	CRITICAL_CHANCE = 12,
-
-	TOTAL_COUNT = 13
 };
 
 /**