diff --git a/SQF/dayz_code/Configs/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons.hpp
index ec996d797..3e7082920 100644
--- a/SQF/dayz_code/Configs/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons.hpp
@@ -165,7 +165,7 @@ class CfgWeapons {
 		aiDispersionCoefY = 21;
 		aiDispersionCoefX = 21;
 		dexterity = 0.51;
-		reloadMagazineSound[] = {"\dayz_sfx\effects\action_refuel_0.ogg",0.1,1,20};
+		reloadMagazineSound[] = {"\dayz_sfx\chainsaw\start-attempt.ogg",0.1,1,20};
 		drySound[] = {"\dayz_sfx\chainsaw\start-attempt.ogg",0.01,1,10};
 		magazines[] = {"CSGAS"};
 		class Library
diff --git a/SQF/dayz_code/compile/player_fired.sqf b/SQF/dayz_code/compile/player_fired.sqf
index 79a142802..e5cb346ee 100644
--- a/SQF/dayz_code/compile/player_fired.sqf
+++ b/SQF/dayz_code/compile/player_fired.sqf
@@ -17,7 +17,7 @@ dayz_combat = 1;
 
 if (_ammo isKindOf "Melee") exitWith {
 	
-	if(!(["Chainsaw",_weapon] call fnc_inString)) then {
+	if(!(_ammo isKindOf "Chainsaw_Swing_Ammo")) then {
 		_unit playActionNow "GestureSwing";
 		[1,1] call dayz_HungerThirst;
 	};
diff --git a/SQF/dayz_code/compile/player_harvest.sqf b/SQF/dayz_code/compile/player_harvest.sqf
index ca9986467..37da149c7 100644
--- a/SQF/dayz_code/compile/player_harvest.sqf
+++ b/SQF/dayz_code/compile/player_harvest.sqf
@@ -50,7 +50,7 @@ if (_ammo isKindOf "Hatchet_Swing_Ammo" or _ammo isKindOf "Chainsaw_Swing_Ammo")
 					_countOut = 1;
 					_itemOut = "PartWoodPile";
 
-					if(_weapon == "Chainsaw") then {
+					if(_ammo isKindOf "Chainsaw_Swing_Ammo") then {
 						_itemOut = "PartWoodLumber";
 					};