diff --git a/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc b/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc
index e19f403..df795ba 100644
--- a/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc
+++ b/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc
@@ -390,6 +390,7 @@ heliRide( lifeId, chopper )
 	chopper VehicleTurretControlOn( self );
 	
 	self PlayerLinkWeaponviewToDelta( chopper, "tag_player", 1.0, 180, 180, 0, 180, true );
+	self setPlayerAngles( level.ac130 getTagAngles( "tag_player" ) );
 	
 	chopper.gunner = self;	
 
@@ -1369,7 +1370,21 @@ heli_explode( altStyle )
 
 	// give "death" notify time to process
 	wait ( 0.05 );
-	self delete();
+	// g_getplayervieworigin fix
+	// we hide this helicopter then delete it
+
+	if (self.heliType == "minigun")
+	{
+		if (isDefined(self))
+			self hide();
+
+		wait 30;
+
+		if (isDefined(self))
+			self delete();
+	}
+	else
+		self delete();
 }
 
 
@@ -2043,7 +2058,16 @@ heli_leave()
 	
 	// give "death" notify time to process
 	wait ( 0.05 );
-	self delete();
+	
+	// g_getplayervieworigin fix
+	// we hide this helicopter then delete it
+	if (isDefined(self))
+		self hide();
+
+	wait 30;
+
+	if (isDefined(self))
+		self delete();
 }
 
 
@@ -2185,4 +2209,4 @@ deleteAfterTime( delay )
 	wait ( delay );
 	
 	self delete();
-}
+}
\ No newline at end of file