diff --git a/src/strategy/values/IsMovingValue.cpp b/src/strategy/values/IsMovingValue.cpp
index a8dbcf66..2a03043c 100644
--- a/src/strategy/values/IsMovingValue.cpp
+++ b/src/strategy/values/IsMovingValue.cpp
@@ -24,5 +24,7 @@ bool IsSwimmingValue::Calculate()
     if (!target)
         return false;
 
-    return target->IsUnderWater() || (target->GetLiquidData().Status == LIQUID_MAP_IN_WATER && target->CanSwim());
+    int8 targetInLiquidState = target->GetLiquidData().Status;
+
+    return targetInLiquidState == LIQUID_MAP_UNDER_WATER || (targetInLiquidState == LIQUID_MAP_IN_WATER && target->CanSwim());
 }