diff --git a/Source/Shared/WeaponC4Bomb.c b/Source/Shared/WeaponC4Bomb.c
index 7e856f30..f29852ab 100755
--- a/Source/Shared/WeaponC4Bomb.c
+++ b/Source/Shared/WeaponC4Bomb.c
@@ -187,6 +187,7 @@ void WeaponC4BOMB_Draw( void ) {
 void WeaponC4BOMB_Release( void ) {
 #ifdef SSQC
 	self.fBombProgress = 0;
+	self.fAttackFinished = time + 1.0;
 #else
 	View_PlayAnimation( ANIM_C4_IDLE );
 	iBombProgress = 0;
@@ -202,22 +203,18 @@ void WeaponC4BOMB_PrimaryFire( void ) {
 	if ( trace_fraction == 1 || self.fInBombZone == FALSE ) {
 		Animation_ReloadWeapon();
 		WeaponC4BOMB_Release();
-		self.fAttackFinished = time + 1.0;
 		return;
 	}
 	
 	// Play the sequence at the start
 	if ( self.fBombProgress == 0 ) {
+		self.fBombProgress = time + 3.0f;
 		Client_SendEvent( self, EV_WEAPON_PRIMARYATTACK );
 		Animation_ShootWeapon();
 	}
-	
-	// Add onto the planting-time thing
-	self.fBombProgress += frametime;
-	
-	centerprint( self, ftos(self.fBombProgress ) );
+
 	// 3 seconds have passed, plant the bomb
-	if ( self.fBombProgress >= 3.0f ) {
+	if ( self.fBombProgress <=  time ) {
 		WeaponC4BOMB_Drop( trace_endpos );
 	}
 #else
diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat
index c321e4f5..e596c5ea 100644
Binary files a/freecs/csprogs.dat and b/freecs/csprogs.dat differ
diff --git a/freecs/progs.dat b/freecs/progs.dat
index a4e816b7..b2f45c57 100644
Binary files a/freecs/progs.dat and b/freecs/progs.dat differ