diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index a97ced78..0edb221b 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -986,10 +986,9 @@ CHeli::UpdateHelis(void)
 
 	// Remove all helis if in a tunnel or under water
 	if(FindPlayerCoors().z < - 2.0f)
-#ifdef FIX_BUGS
-		for(i = 0; i < HELI_CATALINA; i++)
-#else
 		for(i = 0; i < NUM_HELIS; i++)
+#ifdef FIX_BUGS
+			if(i == HELI_CATALINA) continue;
 #endif
 			if(pHelis[i] && pHelis[i]->m_heliStatus != HELI_STATUS_SHOT_DOWN)
 				pHelis[i]->m_heliStatus = HELI_STATUS_FLY_AWAY;