diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 2d55069e98..7c67cdc5c7 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -417,6 +417,21 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
             return value;
         }
 
+        case SelectWrapper::Function_CreatureTargetted:
+
+            {
+                MWWorld::Ptr target;
+                mActor.getClass().getCreatureStats(mActor).getAiSequence().getCombatTarget(target);
+                if (target)
+                {
+                    if (target.getClass().isNpc() && target.getClass().getNpcStats(target).isWerewolf())
+                        return 2;
+                    if (target.getTypeName() == typeid(ESM::Creature).name())
+                        return 1;
+                }
+            }
+            return 0;
+
         default:
 
             throw std::runtime_error ("unknown integer select function");
@@ -532,10 +547,6 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
             return MWBase::Environment::get().getMechanicsManager()->isAggressive(mActor,
                     MWBase::Environment::get().getWorld()->getPlayerPtr());
 
-        case SelectWrapper::Function_CreatureTargetted:
-
-            return mActor.getClass().getCreatureStats (mActor).getCreatureTargetted();
-
         case SelectWrapper::Function_Werewolf:
 
             return mActor.getClass().getNpcStats (mActor).isWerewolf();
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index 3f22998f0e..fa0fbfe136 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -205,6 +205,7 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
         Function_Reputation, Function_FactionRankDiff,
         Function_WerewolfKills,
         Function_RankLow, Function_RankHigh,
+        Function_CreatureTargetted,
         Function_None // end marker
     };
 
@@ -225,7 +226,6 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
         Function_PcVampire, Function_TalkedToPc,
         Function_Alarmed, Function_Detected,
         Function_Attacked, Function_ShouldAttack,
-        Function_CreatureTargetted,
         Function_Werewolf,
         Function_None // end marker
     };
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 72a710c656..ac6f88d449 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -329,16 +329,6 @@ namespace MWMechanics
         mAttacked = attacked;
     }
 
-    bool CreatureStats::getCreatureTargetted() const
-    {
-        MWWorld::Ptr targetPtr;
-        if (mAiSequence.getCombatTarget(targetPtr))
-        {
-            return targetPtr.getTypeName() == typeid(ESM::Creature).name();
-        }
-        return false;
-    }
-
     float CreatureStats::getEvasion() const
     {
         float evasion = (getAttribute(ESM::Attribute::Agility).getModified() / 5.0f) +
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index d13ced3b3a..9a08b58c9c 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -199,8 +199,6 @@ namespace MWMechanics
         bool getAttacked() const;
         void setAttacked (bool attacked);
 
-        bool getCreatureTargetted() const;
-
         float getEvasion() const;
 
         void setKnockedDown(bool value);