diff --git a/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
index ffab43e3c..481393aa6 100644
--- a/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
+++ b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
@@ -105,7 +105,7 @@ void	btSimulationIslandManager::storeIslandActivationState(btCollisionWorld* col
 		for (i=0;i<colWorld->getCollisionObjectArray().size();i++)
 		{
 			btCollisionObject* collisionObject= colWorld->getCollisionObjectArray()[i];
-			if (collisionObject->mergesSimulationIslands())
+			if (!collisionObject->isStaticOrKinematicObject())
 			{
 				collisionObject->setIslandTag( m_unionFind.find(index) );
 				collisionObject->setCompanionId(-1);
diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index cc90ccd53..f96b10278 100644
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -688,8 +688,8 @@ void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 			const btRigidBody* colObj0 = &constraint->getRigidBodyA();
 			const btRigidBody* colObj1 = &constraint->getRigidBodyB();
 
-			if (((colObj0) && ((colObj0)->mergesSimulationIslands())) &&
-				((colObj1) && ((colObj1)->mergesSimulationIslands())))
+			if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
+				((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
 			{
 				if (colObj0->isActive() || colObj1->isActive())
 				{