diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 2b5bc336..208dfbfd 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -1136,8 +1136,8 @@ namespace Sapphire::Entity
     uint8_t m_discovery[445];
     uint32_t m_playTime;
 
-    uint16_t m_classArray[28];
-    uint32_t m_expArray[28];
+    uint16_t m_classArray[ Common::CLASSJOB_SLOTS ];
+    uint32_t m_expArray[ Common::CLASSJOB_SLOTS ];
     uint8_t m_aetheryte[21];
     uint8_t m_unlocks[64];
     uint8_t m_orchestrion[40];
diff --git a/src/world/Network/PacketWrappers/PlayerSetupPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
index 5b57a66d..ae57bc18 100644
--- a/src/world/Network/PacketWrappers/PlayerSetupPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
@@ -55,7 +55,7 @@ namespace Sapphire::Network::Packets::Server
       //memcpy( m_data.aetheryte, player.getAetheryteArray(), sizeof( m_data.aetheryte ) );
 
       // Set the class levels and exp.
-      for( uint8_t i = 0; i < 25; i++ )
+      for( uint8_t i = 0; i < Common::CLASSJOB_SLOTS; i++ )
       {
         m_data.levels[ i ] = player.getClassArray()[ i ];
         m_data.exp[ i ] = player.getExpArray()[ i ];