diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 7d67d38f0..a4f357322 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1196,14 +1196,13 @@ public:
         mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mAlpha));
     }
 
-    // Helper for adding AlphaFader to a subgraph
+    // Helper for adding AlphaFaders to a subgraph
     class SetupVisitor : public osg::NodeVisitor
     {
     public:
         SetupVisitor()
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         {
-            mAlphaFader = new AlphaFader;
         }
 
         virtual void apply(osg::Node &node)
@@ -1225,22 +1224,26 @@ public:
                         callback = callback->getNestedCallback();
                     }
 
+                    osg::ref_ptr<AlphaFader> alphaFader (new AlphaFader);
+
                     if (composite)
-                        composite->addController(mAlphaFader);
+                        composite->addController(alphaFader);
                     else
-                        node.addUpdateCallback(mAlphaFader);
+                        node.addUpdateCallback(alphaFader);
+
+                    mAlphaFaders.push_back(alphaFader);
                 }
             }
             traverse(node);
         }
 
-        osg::ref_ptr<AlphaFader> getAlphaFader()
+        std::vector<osg::ref_ptr<AlphaFader> > getAlphaFaders()
         {
-            return mAlphaFader;
+            return mAlphaFaders;
         }
 
     private:
-        osg::ref_ptr<AlphaFader> mAlphaFader;
+        std::vector<osg::ref_ptr<AlphaFader> > mAlphaFaders;
     };
 
 private:
@@ -1437,7 +1440,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
         {
             mParticleNode->removeChild(mParticleEffect);
             mParticleEffect = NULL;
-            mParticleFader = NULL;
+            mParticleFaders.clear();
         }
 
         if (mCurrentParticleEffect.empty())
@@ -1464,7 +1467,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
             AlphaFader::SetupVisitor alphaFaderSetupVisitor;
             mParticleEffect->accept(alphaFaderSetupVisitor);
-            mParticleFader = alphaFaderSetupVisitor.getAlphaFader();
+            mParticleFaders = alphaFaderSetupVisitor.getAlphaFaders();
         }
     }
 
@@ -1545,8 +1548,8 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
     if (mRainFader)
         mRainFader->setAlpha(weather.mEffectFade * 0.6); // * Rain_Threshold?
-    if (mParticleFader)
-        mParticleFader->setAlpha(weather.mEffectFade);
+    for (std::vector<osg::ref_ptr<AlphaFader> >::const_iterator it = mParticleFaders.begin(); it != mParticleFaders.end(); ++it)
+        (*it)->setAlpha(weather.mEffectFade);
 }
 
 void SkyManager::sunEnable()
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 072083d27..a4eeb861c 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -158,7 +158,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::PositionAttitudeTransform> mParticleNode;
         osg::ref_ptr<osg::Node> mParticleEffect;
-        osg::ref_ptr<AlphaFader> mParticleFader;
+        std::vector<osg::ref_ptr<AlphaFader> > mParticleFaders;
 
         osg::ref_ptr<osg::PositionAttitudeTransform> mCloudNode;
 
diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp
index 37d08e025..34b8da848 100644
--- a/components/sceneutil/statesetupdater.hpp
+++ b/components/sceneutil/statesetupdater.hpp
@@ -15,6 +15,7 @@ namespace SceneUtil
     ///     the first StateSet is the one we can write to, the second is the one currently in use by the draw traversal of the last frame.
     ///     After a frame is completed the places are swapped.
     /// @par Must be set as UpdateCallback on a Node.
+    /// @note Do not add the same StateSetUpdater to multiple nodes.
     /// @note Do not add multiple StateSetControllers on the same Node as they will conflict - instead use the CompositeStateSetUpdater.
     class StateSetUpdater : public osg::NodeCallback
     {