diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 73b72811a..21bf8a096 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -100,14 +100,13 @@ namespace
 
         virtual void traverse(osg::NodeVisitor& nv)
         {
-            const osg::FrameStamp* stamp = nv.getFrameStamp();
-            if (!stamp || nv.getTraversalMode() != osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN)
+            if (nv.getTraversalMode() != osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN)
                 osg::Group::traverse(nv);
             else
             {
                 for (unsigned int i=0; i<getNumChildren(); ++i)
                 {
-                    if (i%2 == stamp->getFrameNumber()%2)
+                    if (i%2 == nv.getTraversalNumber()%2)
                         getChild(i)->accept(nv);
                 }
             }
@@ -182,9 +181,9 @@ namespace
             if (!geom)
                 return false;
 
-            if (mLastFrameNumber == nv->getFrameStamp()->getFrameNumber())
+            if (mLastFrameNumber == nv->getTraversalNumber())
                 return false;
-            mLastFrameNumber = nv->getFrameStamp()->getFrameNumber();
+            mLastFrameNumber = nv->getTraversalNumber();
 
             geom->transformSoftwareMethod();
             return false;
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index dc6da73a6..d3e11050d 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -294,9 +294,9 @@ namespace SceneUtil
 
         // update light list if necessary
         // makes sure we don't update it more than once per frame when rendering with multiple cameras
-        if (mLastFrameNumber != nv->getFrameStamp()->getFrameNumber())
+        if (mLastFrameNumber != nv->getTraversalNumber())
         {
-            mLastFrameNumber = nv->getFrameStamp()->getFrameNumber();
+            mLastFrameNumber = nv->getTraversalNumber();
 
             // Don't use Camera::getViewMatrix, that one might be relative to another camera!
             const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index bd3d613a3..023ac12d5 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -218,9 +218,9 @@ void RigGeometry::update(osg::NodeVisitor* nv)
     if (!mSkeleton->getActive() && mLastFrameNumber != 0)
         return;
 
-    if (mLastFrameNumber == nv->getFrameStamp()->getFrameNumber())
+    if (mLastFrameNumber == nv->getTraversalNumber())
         return;
-    mLastFrameNumber = nv->getFrameStamp()->getFrameNumber();
+    mLastFrameNumber = nv->getTraversalNumber();
 
     mSkeleton->updateBoneMatrices(nv);
 
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index 5c2af4397..d66131b4e 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -104,10 +104,10 @@ Bone* Skeleton::getBone(const std::string &name)
 
 void Skeleton::updateBoneMatrices(osg::NodeVisitor* nv)
 {
-    if (nv->getFrameStamp()->getFrameNumber() != mLastFrameNumber)
+    if (nv->getTraversalNumber() != mLastFrameNumber)
         mNeedToUpdateBoneMatrices = true;
 
-    mLastFrameNumber = nv->getFrameStamp()->getFrameNumber();
+    mLastFrameNumber = nv->getTraversalNumber();
 
     if (mNeedToUpdateBoneMatrices)
     {