diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 31dc2bbb453..4c6f2841e39 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -19469,7 +19469,7 @@ void Player::SendInitialPacketsBeforeAddToMap()
     // SMSG_POWER_UPDATE
 
     // set fly flag if in fly form or taxi flight to prevent visually drop at ground in showup moment
-    if(HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED) || HasAuraType(SPELL_AURA_FLY) || IsTaxiFlying())
+    if (IsFreeFlying() || IsTaxiFlying())
         m_movementInfo.AddMovementFlag(MOVEFLAG_FLYING);
 
     SetMover(this);
diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp
index 2290b047430..61689eaf58e 100644
--- a/src/game/ThreatManager.cpp
+++ b/src/game/ThreatManager.cpp
@@ -137,7 +137,7 @@ void HostileReference::updateOnlineStatus()
     // target is not in flight
     if(isValid() &&
         ((getTarget()->GetTypeId() != TYPEID_PLAYER || !((Player*)getTarget())->isGameMaster()) ||
-        !getTarget()->hasUnitState(UNIT_STAT_TAXI_FLIGHT)))
+        !getTarget()->IsTaxiFlying()))
     {
         Creature* creature = (Creature* ) getSourceUnit();
         online = getTarget()->isInAccessablePlaceFor(creature);
diff --git a/src/game/Traveller.h b/src/game/Traveller.h
index 1694f290604..89688d2f3f7 100644
--- a/src/game/Traveller.h
+++ b/src/game/Traveller.h
@@ -91,10 +91,12 @@ inline float Traveller<Creature>::GetMoveDestinationTo(float x, float y, float z
 {
     float dx = x - GetPositionX();
     float dy = y - GetPositionY();
-    float dz = z - GetPositionZ();
 
     if(i_traveller.hasUnitState(UNIT_STAT_TAXI_FLIGHT))
+    {
+        float dz = z - GetPositionZ();
         return sqrt((dx*dx) + (dy*dy) + (dz*dz));
+    }
     else                                                    //Walking on the ground
         return sqrt((dx*dx) + (dy*dy));
 }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 24b89bc2dd4..8cccfa3cdfe 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10228"
+ #define REVISION_NR "10229"
 #endif // __REVISION_NR_H__