diff --git a/.gitignore b/.gitignore
index fd0deab..75cf6f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ src/Release/vc142.pdb
 *.txt
 *.tlog
 *.exe
+*.db-wal
+*.db-shm
+*.opendb
diff --git a/src/Features/EnginePrediction/EnginePrediction.cpp b/src/Features/EnginePrediction/EnginePrediction.cpp
index f12e533..6b5bdf3 100644
--- a/src/Features/EnginePrediction/EnginePrediction.cpp
+++ b/src/Features/EnginePrediction/EnginePrediction.cpp
@@ -34,7 +34,7 @@ void CFeatures_EnginePrediction::Start(C_BasePlayer* pLocal, CUserCmd* cmd)
 
 	if (cmd->weaponselect != 0)
 	{
-		C_BaseCombatWeapon* pWeapon = pLocal->GetActiveWeapon()->As<C_TerrorWeapon*>();
+		C_BaseCombatWeapon* pWeapon = I::ClientEntityList->GetClientEntity(cmd->weaponselect)->As<C_BaseCombatWeapon*>();
 
 		if (pWeapon)
 			pLocal->SelectItem(pWeapon->GetName(), cmd->weaponsubtype);