diff --git a/Source/Game/Chat/Commands/GMCommands.cs b/Source/Game/Chat/Commands/GMCommands.cs
index 6486b262c..65b595171 100644
--- a/Source/Game/Chat/Commands/GMCommands.cs
+++ b/Source/Game/Chat/Commands/GMCommands.cs
@@ -105,9 +105,15 @@ namespace Game.Chat
             string arg = args.NextString().ToLower();
 
             if (arg == "on")
+            { 
                 target.SetCanFly(true);
+                target.SetCanTransitionBetweenSwimAndFly(true);
+            }
             else if (arg == "off")
+            { 
                 target.SetCanFly(false);
+                target.SetCanTransitionBetweenSwimAndFly(false);
+            }
             else
             {
                 handler.SendSysMessage(CypherStrings.UseBol);
diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs
index a31158308..b932cc501 100644
--- a/Source/Game/Entities/Unit/Unit.Movement.cs
+++ b/Source/Game/Entities/Unit/Unit.Movement.cs
@@ -263,7 +263,7 @@ namespace Game.Entities
             return true;
         }
 
-        bool SetCanTransitionBetweenSwimAndFly(bool enable)
+        public bool SetCanTransitionBetweenSwimAndFly(bool enable)
         {
             if (!IsTypeId(TypeId.Player))
                 return false;