diff --git a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
index 6afa4ceea..041f44a9f 100644
--- a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
+++ b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
@@ -64,12 +64,14 @@ btCollisionShape* btBulletWorldImporter::convertCollisionShape(  btCollisionShap
 				btConvexInternalShapeData* bsd = (btConvexInternalShapeData*)shapeData;
 				btVector3 implicitShapeDimensions;
 				implicitShapeDimensions.deSerializeFloat(bsd->m_implicitShapeDimensions);
+				btVector3 localScaling;
+				localScaling.deSerializeFloat(bsd->m_localScaling);
 				btVector3 margin(bsd->m_collisionMargin,bsd->m_collisionMargin,bsd->m_collisionMargin);
 				switch (shapeData->m_shapeType)
 				{
 					case BOX_SHAPE_PROXYTYPE:
 						{
-							shape = createBoxShape(implicitShapeDimensions+margin);
+							shape = createBoxShape(implicitShapeDimensions/localScaling+margin);
 							break;
 						}
 					case SPHERE_SHAPE_PROXYTYPE:
diff --git a/src/BulletCollision/CollisionShapes/btCompoundShape.cpp b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
index 22fb2c981..cd0e436ca 100644
--- a/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
+++ b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
@@ -267,18 +267,19 @@ void btCompoundShape::calculatePrincipalAxisTransform(btScalar* masses, btTransf
 
 void btCompoundShape::setLocalScaling(const btVector3& scaling)
 {
-	m_localScaling = scaling;
 
 	for(int i = 0; i < m_children.size(); i++)
 	{
 		btTransform childTrans = getChildTransform(i);
 		btVector3 childScale = m_children[i].m_childShape->getLocalScaling();
-		childScale = childScale * (childTrans.getBasis() * scaling);
+//		childScale = childScale * (childTrans.getBasis() * scaling);
+		childScale = childScale * scaling / m_localScaling;
 		m_children[i].m_childShape->setLocalScaling(childScale);
 		childTrans.setOrigin((childTrans.getOrigin())*scaling);
 		updateChildTransform(i, childTrans);
 		recalculateLocalAabb();
 	}
+	m_localScaling = scaling;
 }