diff --git a/releases/3.2.0/source/cl_dll/input.cpp b/releases/3.2.0/source/cl_dll/input.cpp
index 138b0d1..1fa2bd5 100644
--- a/releases/3.2.0/source/cl_dll/input.cpp
+++ b/releases/3.2.0/source/cl_dll/input.cpp
@@ -1514,6 +1514,7 @@ void CL_ResetButtonBits( int bits )
 		{
 			// totally clear state
 			in_attack.state &= ~7;
+			in_attack2.state &= ~7;
 		}
 	}
 }
diff --git a/releases/3.2.0/source/mod/AvHAlienAbilities.cpp b/releases/3.2.0/source/mod/AvHAlienAbilities.cpp
index 32278da..2beb3a7 100644
--- a/releases/3.2.0/source/mod/AvHAlienAbilities.cpp
+++ b/releases/3.2.0/source/mod/AvHAlienAbilities.cpp
@@ -58,6 +58,8 @@
 #include "mod/AvHHud.h"
 extern int g_runfuncs;
 void IN_Attack2Down();
+void IN_Attack2Up();
+bool CheckInAttack();
 #endif
 
 LINK_ENTITY_TO_CLASS(kwLeap, AvHLeap);
@@ -303,7 +305,11 @@ void AvHCharge::SecondaryAttack()
 void AvHCharge::FireProjectiles(void)
 {
 #ifdef AVH_CLIENT
-	IN_Attack2Down();
+	if (CheckInAttack())
+		IN_Attack2Down();
+	else
+		IN_Attack2Up();
+
 	//gHUD.SetAlienAbility(this->GetAbilityImpulse());
 #endif