diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 4cc1ad9a6..d7260cd8e 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -257,7 +257,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags, uint32 flags2
         {
             case TYPEID_UNIT:
             {
-                flags2 = ((Unit*)this)->isInFlight() ? (MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_LEVITATING) : MOVEMENTFLAG_NONE;
+                flags2 = ((Creature*)this)->canFly() ? (MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_LEVITATING) : MOVEMENTFLAG_NONE;
             }
             break;
             case TYPEID_PLAYER:
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f40da81ac..590cdfcbb 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 "8646"
+ #define REVISION_NR "8647"
 #endif // __REVISION_NR_H__