diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index fe5f19848d..6530f140c1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2359,7 +2359,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (module != null)
             {
                 UUID npcID = new UUID(npc.m_string);
-                if (module.IsNPC(npcID))
+                if (module.IsNPC(npcID, m_host.ParentGroup.Scene))
                 {
                     UUID ownerID = module.GetOwner(npcID);
                     if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)
@@ -2376,7 +2376,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (module != null)
             {
                 UUID npcID = new UUID(npc.m_string);
-                if (module.IsNPC(npcID))
+                if (module.IsNPC(npcID, m_host.ParentGroup.Scene))
                 {
                     UUID ownerID = module.GetOwner(npcID);
                     if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index e9e7605e16..44aff21e62 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -185,8 +185,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void osNpcSit(key npc, key target, int options);
         void osNpcStand(LSL_Key npc);
         void osNpcRemove(key npc);
-        public void osNpcPlayAnimation(LSL_Key npc, string animation);
-        public void osNpcStopAnimation(LSL_Key npc, string animation);
+        void osNpcPlayAnimation(LSL_Key npc, string animation);
+        void osNpcStopAnimation(LSL_Key npc, string animation);
 
         LSL_Key osOwnerSaveAppearance(string notecard);
         LSL_Key osAgentSaveAppearance(key agentId, string notecard);