diff --git a/src/objects/Stinger.cpp b/src/objects/Stinger.cpp
index 79730c89..848a7cf7 100644
--- a/src/objects/Stinger.cpp
+++ b/src/objects/Stinger.cpp
@@ -75,10 +75,16 @@ CStinger::Remove()
 
 	for (int32 i = 0; i < NUM_STINGER_SEGMENTS; i++) {
 		CStingerSegment *spikeSegment = pSpikes[i];
+
+#ifdef FIX_BUGS
+		CWorld::Remove(spikeSegment);
+		delete spikeSegment;
+#else
 		if (spikeSegment->m_entryInfoList.first != nil)
 			spikeSegment->bRemoveFromWorld = true;
 		else
 			delete spikeSegment;
+#endif
 	}
 	bIsDeployed = false;
 }