diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
index 77ee1b7a..4e492934 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
@@ -107,7 +107,10 @@ public class CmdFly extends FCommand {
                         if (fPlayer == null) {
                             continue;
                         }
-                        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+                        if (player.getGameMode() == GameMode.CREATIVE) {
+                            continue;
+                        }
+                        if (! SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
                             continue;
                         }
                         Faction myFaction = fPlayer.getFaction();