diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index 71cd46243..75a66f2a4 100644
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -121,6 +121,11 @@ void	btDiscreteDynamicsWorld::synchronizeMotionStates()
 void	btDiscreteDynamicsWorld::stepSimulation(float timeStep, int numSubsteps)
 {
 
+	//process some debugging flags
+	if (getDebugDrawer())
+	{
+		gDisableDeactivation = (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_NoDeactivation) != 0;
+	}
 	if (!btFuzzyZero(timeStep) && numSubsteps)
 	{