diff --git a/src/osgAnimation/MorphTransformHardware.cpp b/src/osgAnimation/MorphTransformHardware.cpp
index 40ae94007..48119c813 100644
--- a/src/osgAnimation/MorphTransformHardware.cpp
+++ b/src/osgAnimation/MorphTransformHardware.cpp
@@ -48,7 +48,8 @@ bool MorphTransformHardware::init(MorphGeometry& morphGeometry)
     ///check for correct morph configuration
     ///(blender osgexport doesn't set sources so assume morphgeom arrays are sources)
     if(pos)
-    {   pos->setDataVariance(osg::Object::STATIC);
+    {
+        pos->setDataVariance(osg::Object::STATIC);
         ///check if source is setted correctly
         if (!vertexSource|| vertexSource->size() != pos->size())
         {
diff --git a/src/osgAnimation/RigTransformHardware.cpp b/src/osgAnimation/RigTransformHardware.cpp
index 427cd313d..e474cde00 100644
--- a/src/osgAnimation/RigTransformHardware.cpp
+++ b/src/osgAnimation/RigTransformHardware.cpp
@@ -346,8 +346,7 @@ bool RigTransformHardware::init(RigGeometry& rig)
         stateset->removeUniform("matrixPalette");
         stateset->addUniform(_uniformMatrixPalette);
 
-        stateset->removeAttribute(osg::StateAttribute::PROGRAM);
-        stateset->setAttributeAndModes(program.get());
+        stateset->setAttribute(program.get());
 
         _needInit = false;
         return true;