diff --git a/Source/Server/func_bomb_target.cpp b/Source/Server/func_bomb_target.cpp
index bee35639..a14b260e 100755
--- a/Source/Server/func_bomb_target.cpp
+++ b/Source/Server/func_bomb_target.cpp
@@ -6,7 +6,7 @@
 *
 ****/
 
-class func_bomb_target
+class func_bomb_target:CBaseTrigger
 {
 	void() func_bomb_target;
 	virtual void() touch;
@@ -26,10 +26,7 @@ void func_bomb_target::touch(void)
 
 void func_bomb_target::func_bomb_target(void)
 {
-	angles = [0,0,0];
-	movetype = MOVETYPE_NONE;
-	solid = SOLID_TRIGGER;
-	setmodel(this, model);
-	model = 0;
+	CBaseTrigger::CBaseTrigger();
+	CBaseTrigger::InitBrushTrigger();
 	iBombZones++;
 }
diff --git a/Source/Shared/WeaponC4Bomb.c b/Source/Shared/WeaponC4Bomb.c
index eca9e69a..89fc01fd 100755
--- a/Source/Shared/WeaponC4Bomb.c
+++ b/Source/Shared/WeaponC4Bomb.c
@@ -112,10 +112,8 @@ static void WeaponC4BOMB_Think( void ) {
 			
 		while ( eBombChain ) {
 			if ( ( eBombChain.classname == "func_bomb_target" ) ) {
-				entity eOld = self;
-				self = eBombChain;
-				//Entities_UseTargets();
-				self = eOld;
+				CBaseTrigger targetty = (CBaseTrigger)eBombChain;
+				targetty.UseTargets();
 			}
 			eBombChain = eBombChain.chain;
 		}