diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index 24843770..ef90bc0f 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -472,6 +472,9 @@ bool IsTargetStateGood(CachedEntity* entity) {
 		// Check if sticky aimbot is enabled
 		if (!stickybot) return false;
 		
+		// Only hitscan weapons can break stickys so check for them.
+		if (!(GetWeaponMode() == weapon_hitscan || GetWeaponMode() == weapon_melee)) return false;
+
 		// Check if target is within range
 		if (EffectiveTargetingRange()) {
 			if (entity->m_flDistance > (int)EffectiveTargetingRange()) return false;
diff --git a/src/hooks/others.cpp b/src/hooks/others.cpp
index 273b147b..2dc351cb 100644
--- a/src/hooks/others.cpp
+++ b/src/hooks/others.cpp
@@ -214,7 +214,7 @@ void Shutdown_hook(void* _this, const char* reason) {
 static CatVar resolver(CV_SWITCH, "resolver", "0", "Resolve angles");
 
 CatEnum namesteal_enum({ "OFF", "PASSIVE", "ACTIVE" });
-CatVar namesteal(CV_SWITCH, "name_stealer", "0", "Name Stealer", "Attemt to steal your teammates names. Usefull for avoiding kicks\nPassive only changes when the name stolen is no longer the best name to use\nActive Attemps to change the name whenever possible");
+CatVar namesteal(namesteal_enum, "name_stealer", "0", "Name Stealer", "Attemt to steal your teammates names. Usefull for avoiding kicks\nPassive only changes when the name stolen is no longer the best name to use\nActive Attemps to change the name whenever possible");
 
 static std::string stolen_name;