diff --git a/source/enemy/nclam.h b/source/enemy/nclam.h
index 456c2b7d3..1f10d025c 100644
--- a/source/enemy/nclam.h
+++ b/source/enemy/nclam.h
@@ -40,7 +40,7 @@ class CNpcStaticClamEnemy : public CNpcClamEnemy
 public:
 	virtual void		postInit();
 	virtual u8			hasBeenAttacked()						{return( false );}
-	virtual	CRECT const	*getThinkBBox()							{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()							{return( CThing::getThinkBBox() );}
 protected:
 	virtual s32			getFrameShift( int _frames );
 	virtual void		collidedWith(CThing *_thisThing);
diff --git a/source/enemy/nsjfish.h b/source/enemy/nsjfish.h
index 6a0739e42..105c4a52d 100644
--- a/source/enemy/nsjfish.h
+++ b/source/enemy/nsjfish.h
@@ -29,7 +29,7 @@ public:
 	virtual void		render();
 	virtual int			getFrameCount()							{return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );}
 	virtual u8			canCollideWithEnemy()					{return( false );}
-	virtual	CRECT const	*getThinkBBox()							{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()							{return( CThing::getThinkBBox() );}
 protected:
 	virtual bool		processSensor();
 	virtual void		processClose( int _frames );
diff --git a/source/hazard/hrweight.h b/source/hazard/hrweight.h
index bc63e6f6a..06976f2dd 100644
--- a/source/hazard/hrweight.h
+++ b/source/hazard/hrweight.h
@@ -25,7 +25,7 @@ public:
 	virtual void		render();
 	DVECTOR const		&getWheelPos()											{return( m_wheelPos );}
 	void				setTriggered()											{m_triggered = true;}
-	virtual	CRECT const	*getThinkBBox()											{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()											{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		setWaypoints( sThingHazard *ThisHazard );
 	virtual void		processMovement( int _frames );
diff --git a/source/hazard/hrwheel.h b/source/hazard/hrwheel.h
index f5cf51c3e..e160d8fc2 100644
--- a/source/hazard/hrwheel.h
+++ b/source/hazard/hrwheel.h
@@ -29,7 +29,7 @@ public:
 	DVECTOR const		&getWheelPos()											{return( m_wheelPos );}
 	void				linkToWeight( CNpcRisingWeightHazard *weight )			{m_weight = weight;}
 	virtual void		render();
-	virtual	CRECT const	*getThinkBBox()											{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()											{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		setWaypoints( sThingHazard *ThisHazard );
 	virtual void		collidedWith(CThing *_thisThing);
diff --git a/source/platform/pbaloon.h b/source/platform/pbaloon.h
index ac7f399e0..947f65da0 100644
--- a/source/platform/pbaloon.h
+++ b/source/platform/pbaloon.h
@@ -36,7 +36,7 @@ public:
 	virtual void		postInit();
 	virtual void		render();
 	virtual void		shutdown();
-	virtual	CRECT const	*getThinkBBox()									{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()									{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		processMovement( int _frames );
diff --git a/source/platform/pbranch.h b/source/platform/pbranch.h
index ea7c8d946..1c8ab04b0 100644
--- a/source/platform/pbranch.h
+++ b/source/platform/pbranch.h
@@ -23,7 +23,7 @@ class CNpcBranchPlatform : public CNpcPlatform
 public:
 	virtual void		postInit();
 	virtual void		render();
-	virtual	CRECT const	*getThinkBBox()							{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()												{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		processMovement( int _frames );
diff --git a/source/platform/pclam.h b/source/platform/pclam.h
index 5c103f8b3..8bca0cf7d 100644
--- a/source/platform/pclam.h
+++ b/source/platform/pclam.h
@@ -22,7 +22,7 @@ class CNpcClamPlatform : public CNpcPlatform
 {
 public:
 	virtual void		render();
-	virtual	CRECT const	*getThinkBBox()							{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()									{return( CThing::getThinkBBox() );}
 	//void				setBBox();
 };
 
diff --git a/source/platform/prbridge.h b/source/platform/prbridge.h
index 0c249f888..65ab1fc7f 100644
--- a/source/platform/prbridge.h
+++ b/source/platform/prbridge.h
@@ -23,7 +23,7 @@ class CNpcRisingBridgePlatform : public CNpcPlatform
 public:
 	virtual void		postInit();
 	virtual void		trigger();
-	virtual	CRECT const	*getThinkBBox()											{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()											{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		processMovement( int _frames );
diff --git a/source/platform/psbarrel.h b/source/platform/psbarrel.h
index 98c13567a..46cfc901c 100644
--- a/source/platform/psbarrel.h
+++ b/source/platform/psbarrel.h
@@ -23,7 +23,7 @@ class CNpcSteerableBarrelPlatform : public CNpcPlatform
 public:
 	virtual void		render();
 	virtual void		postInit();
-	virtual	CRECT const	*getThinkBBox()											{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()											{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		processMovement( int _frames );
 	virtual void		collidedWith(CThing *_thisThing);
diff --git a/source/platform/pseesaw.h b/source/platform/pseesaw.h
index 30a4c4b52..bdb8745c1 100644
--- a/source/platform/pseesaw.h
+++ b/source/platform/pseesaw.h
@@ -23,7 +23,7 @@ class CNpcSeesawPlatform : public CNpcPlatform
 public:
 	virtual void		postInit();
 	virtual void		render();
-	virtual	CRECT const	*getThinkBBox()											{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()											{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		processMovement( int _frames );
 
diff --git a/source/platform/ptrpdoor.h b/source/platform/ptrpdoor.h
index 375eba212..39f23f2e7 100644
--- a/source/platform/ptrpdoor.h
+++ b/source/platform/ptrpdoor.h
@@ -25,7 +25,7 @@ public:
 	DVECTOR const		&getTriggerPos()										{return( m_triggerPos );}
 	void				setTriggered()											{m_triggered = true;}
 	virtual void		render();
-	virtual	CRECT const	*getThinkBBox()											{return( &getCollisionArea() );}
+	virtual	CRECT const	*getThinkBBox()											{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		processMovement( int _frames );