diff --git a/src/animation.cpp b/src/animation.cpp
index 0ab94ff..6859859 100644
--- a/src/animation.cpp
+++ b/src/animation.cpp
@@ -150,7 +150,7 @@ bool Animation::_LoadAnimationBlock(const char* szBlockName)
 
 void Animation::_PlayAnimation(RpClump* pClump, int animGroup, int animID, float blend)
 {
-    CAnimBlendAssociation* pAnimStaticAssoc = CAnimManager::GetAnimAssociation((AssocGroupId)animGroup, (AnimationId)animID);
+    CAnimBlendAssociation* pAnimStaticAssoc = CAnimManager::GetAnimAssociation(animGroup, animID);
     CAnimBlendAssociation* pAnimAssoc = RpAnimBlendClumpGetFirstAssociation(pClump);
     while (pAnimAssoc)
     {
@@ -162,7 +162,7 @@ void Animation::_PlayAnimation(RpClump* pClump, int animGroup, int animID, float
         }
         pAnimAssoc = RpAnimBlendGetNextAssociation(pAnimAssoc);
     }
-    pAnimAssoc = CAnimManager::BlendAnimation(pClump, (AssocGroupId)animGroup, (AnimationId)animID, blend);
+    pAnimAssoc = CAnimManager::BlendAnimation(pClump, animGroup, animID, blend);
     pAnimAssoc->m_nFlags = 0x1 | 0x20;
 
     if (m_Loop)
diff --git a/src/version.h b/src/version.h
index e932436..d2a817c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -2,5 +2,5 @@
 #define MENU_NAME "Cheat Menu"
 #define MENU_VERSION_NUMBER "3.3"
 #define MENU_VERSION MENU_VERSION_NUMBER"-beta"
-#define BUILD_NUMBER "20220501"
+#define BUILD_NUMBER "20220523"
 #define MENU_TITLE MENU_NAME " v" MENU_VERSION
diff --git a/src/weapon.cpp b/src/weapon.cpp
index 1d0f4ad..984768d 100644
--- a/src/weapon.cpp
+++ b/src/weapon.cpp
@@ -28,7 +28,7 @@ void Weapon::Init()
 #endif
 
 
-        uchar slot = player->m_nActiveWeaponSlot;
+        uchar slot = BY_GAME(player->m_nActiveWeaponSlot, player->m_nSelectedWepSlot, player->m_nSelectedWepSlot);
         if (m_nCurrentWeaponSlot != slot)
         {
             eWeaponType weaponType = player->m_aWeapons[slot].m_eWeaponType;
@@ -229,7 +229,7 @@ void Weapon::ShowPage()
         float x, y, z;
         Command<Commands::GET_OFFSET_FROM_CHAR_IN_WORLD_COORDS>(hplayer, 0.0, 3.0, 0.0, &x, &y, &z);
 
-        eWeaponType weaponType = pPlayer->m_aWeapons[pPlayer->m_nActiveWeaponSlot].m_eWeaponType;
+        eWeaponType weaponType = pPlayer->m_aWeapons[BY_GAME(pPlayer->m_nActiveWeaponSlot, pPlayer->m_nSelectedWepSlot, pPlayer->m_nSelectedWepSlot)].m_eWeaponType;
         if (weaponType)
         {
             int model = 0, pickup = 0;
diff --git a/tools/premake5.lua b/tools/premake5.lua
index 280bf73..27c75a7 100644
--- a/tools/premake5.lua
+++ b/tools/premake5.lua
@@ -128,6 +128,10 @@ project "CheatMenuIII"
         "PLUGIN_SGV_10US"
     }
 
+    linkoptions { 
+        "/FORCE:MULTIPLE"
+    }
+
     pchheader "pch.h"
     pchsource "../src/pch.cpp"