diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 7d27e73bd..d0a0783d3 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -160,13 +160,11 @@ namespace MWBase
             virtual bool isAIActive() = 0;
 
             virtual void getObjectsInRange (const Ogre::Vector3& position, float radius, std::vector<MWWorld::Ptr>& objects) = 0;
+            virtual void getActorsInRange(const Ogre::Vector3 &position, float radius, std::vector<MWWorld::Ptr> &objects) = 0;
 
             ///return the list of actors which are following the given actor (ie AiFollow is active and the target is the actor)
             virtual std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) = 0;
-
-            ///return the list of actors
-            virtual MWMechanics::Actors& getActors() = 0;
-
+            
             virtual void playerLoaded() = 0;
     };
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 868a09e2e..0ef94c13c 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -985,13 +985,13 @@ namespace MWMechanics
         mObjects.getObjectsInRange(position, radius, objects);
     }
 
+    void MechanicsManager::getActorsInRange(const Ogre::Vector3 &position, float radius, std::vector<MWWorld::Ptr> &objects)
+    {
+        mActors.getObjectsInRange(position, radius, objects);
+    }
+
     std::list<MWWorld::Ptr> MechanicsManager::getActorsFollowing(const MWWorld::Ptr& actor)
     {
         return mActors.getActorsFollowing(actor);
     }
-
-    MWMechanics::Actors& MechanicsManager::getActors()
-    {
-        return *mActors;
-    }
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index a00c79525..603815744 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -134,11 +134,10 @@ namespace MWMechanics
             virtual void updateMagicEffects (const MWWorld::Ptr& ptr);
 
             virtual void getObjectsInRange (const Ogre::Vector3& position, float radius, std::vector<MWWorld::Ptr>& objects);
+            virtual void getActorsInRange(const Ogre::Vector3 &position, float radius, std::vector<MWWorld::Ptr> &objects);
 
             virtual std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
 
-            virtual MWMechanics::Actors& getActors();
-
             virtual void toggleAI();
             virtual bool isAIActive();
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 9cc873c0f..f4ca5ee27 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -134,14 +134,16 @@ namespace MWWorld
 
         ptr.getClass().getCreatureStats(ptr).setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, sneak);
 
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
+
         // Find all the actors who might be able to see the player
         std::vector<MWWorld::Ptr> neighbors;
-        MWBase::Environment::get().getMechanicsManager()->getActors().getObjectsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
+        MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
                                     esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
-            if ( MechanicsManager::awarenessCheck(ptr, *it) ) 
+            if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) ) 
                 MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
-        if (!neighbors)
+        if (!neighbors.size())
             MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
     }