diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index a66bd99db..cb7c2feb0 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -207,7 +207,7 @@ struct RecordFactoryEntry {
 static const RecordFactoryEntry recordFactories [] = {
 
     { "NiNode",                     &construct <NiNode                      >, RC_NiNode                        },
-    { "AvoidNode",                  &construct <NiNode                      >, RC_NiNode                        },
+    { "AvoidNode",                  &construct <NiNode                      >, RC_AvoidNode                     },
     { "NiBSParticleNode",           &construct <NiNode                      >, RC_NiBSParticleNode              },
     { "NiBSAnimationNode",          &construct <NiNode                      >, RC_NiBSAnimationNode             },
     { "NiBillboardNode",            &construct <NiNode                      >, RC_NiNode                        },
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 3f852ed83..87e342dca 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -36,6 +36,7 @@ enum RecordType
 {
   RC_MISSING = 0,
   RC_NiNode,
+  RC_AvoidNode,
   RC_NiTriShape,
   RC_NiRotatingParticles,
   RC_NiAutoNormalParticles,
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index a3eff95c3..a1e2cd8d1 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -185,6 +185,10 @@ void ManualBulletShapeLoader::handleNode(btTriangleMesh* mesh, const Nif::Node *
     else
         isCollisionNode = isCollisionNode && (node->recType != Nif::RC_RootCollisionNode);
 
+    // Don't collide with AvoidNode shapes
+    if(node->recType == Nif::RC_AvoidNode)
+        flags |= 0x800;
+
     // Marker objects
     /// \todo don't do this in the editor
     std::string nodename = node->name;