diff --git a/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java b/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java
index 1838010f4b1..f213a2cf409 100644
--- a/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java
+++ b/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java
@@ -30,6 +30,7 @@ package mage.cards.g;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
+
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
@@ -112,7 +113,7 @@ class GhostlyFlickerEffect extends OneShotEffect {
             Set<Card> toBattlefield = new HashSet<>();
             for (Card card : toExile) {
                 Zone currentZone = game.getState().getZone(card.getId());
-                if (!(Zone.BATTLEFIELD == currentZone) && Zone.isPublicZone(currentZone)) {
+                if (Zone.BATTLEFIELD != currentZone && currentZone.isPublicZone()) {
                     toBattlefield.add(game.getCard(card.getId()));
                 }
             }
diff --git a/Mage/src/main/java/mage/constants/Zone.java b/Mage/src/main/java/mage/constants/Zone.java
index 73b2d4743c4..f9a24747616 100644
--- a/Mage/src/main/java/mage/constants/Zone.java
+++ b/Mage/src/main/java/mage/constants/Zone.java
@@ -33,7 +33,13 @@ package mage.constants;
  */
 public enum Zone {
 
-    HAND, GRAVEYARD, LIBRARY, BATTLEFIELD, STACK, EXILED, ALL, OUTSIDE, COMMAND;
+    HAND(false), GRAVEYARD(true), LIBRARY(false), BATTLEFIELD(true), STACK(true), EXILED(true), ALL(false), OUTSIDE(false), COMMAND(false);
+
+    private boolean isPublic;
+
+    Zone(boolean isPublic){
+        this.isPublic = isPublic;
+    }
 
     public boolean match(Zone zone) {
         return (this == zone || this == ALL || zone == ALL);
@@ -47,7 +53,7 @@ public enum Zone {
         return super.toString();
     }
 
-    public static boolean isPublicZone(Zone zone) {
-        return GRAVEYARD.equals(zone) || BATTLEFIELD.equals(zone) || STACK.equals(zone) || EXILED.equals(zone) || COMMAND.equals(zone);
+    public boolean isPublicZone(){
+        return isPublic;
     }
 }