diff --git a/bukkit/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java b/bukkit/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java
index dc18510..aef6d4b 100644
--- a/bukkit/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java
+++ b/bukkit/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java
@@ -133,7 +133,7 @@ public class FlagDefinitionSerializer implements TypeSerializer<FlagDefinition>
         }
 
         Set<Context> contexts = new HashSet<>();
-        GDPermissionHolder subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+        GDPermissionHolder subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
         if (contextList != null) {
             for (String context : contextList) {
                 final String parts[] = context.split("=");
@@ -168,7 +168,7 @@ public class FlagDefinitionSerializer implements TypeSerializer<FlagDefinition>
                         if (PermissionUtil.getInstance().hasGroupSubject(value)) {
                             subject = PermissionHolderCache.getInstance().getOrCreateGroup(value);
                             if (subject == null) {
-                                subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+                                subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
                             }
                         }
                     }
diff --git a/bukkit/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java b/bukkit/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java
index 5355933..f60b08d 100644
--- a/bukkit/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java
+++ b/bukkit/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java
@@ -149,7 +149,7 @@ public class GDFlagDefinition implements FlagDefinition {
         private boolean isAdmin = false;
         private Set<Context> contexts = new HashSet<>();
         private List<FlagData> data = new ArrayList<>();
-        private Subject subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+        private Subject subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
         private String displayName;
         private String groupName;
         private Tristate defaultValue = Tristate.UNDEFINED;
@@ -231,7 +231,7 @@ public class GDFlagDefinition implements FlagDefinition {
             this.groupName = "";
             this.defaultValue = Tristate.UNDEFINED;
             this.description = TextComponent.empty();
-            this.subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+            this.subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
             return this;
         }
 
diff --git a/sponge/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java b/sponge/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java
index dc18510..aef6d4b 100644
--- a/sponge/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java
+++ b/sponge/src/main/java/com/griefdefender/configuration/serializer/FlagDefinitionSerializer.java
@@ -133,7 +133,7 @@ public class FlagDefinitionSerializer implements TypeSerializer<FlagDefinition>
         }
 
         Set<Context> contexts = new HashSet<>();
-        GDPermissionHolder subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+        GDPermissionHolder subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
         if (contextList != null) {
             for (String context : contextList) {
                 final String parts[] = context.split("=");
@@ -168,7 +168,7 @@ public class FlagDefinitionSerializer implements TypeSerializer<FlagDefinition>
                         if (PermissionUtil.getInstance().hasGroupSubject(value)) {
                             subject = PermissionHolderCache.getInstance().getOrCreateGroup(value);
                             if (subject == null) {
-                                subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+                                subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
                             }
                         }
                     }
diff --git a/sponge/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java b/sponge/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java
index 5355933..f60b08d 100644
--- a/sponge/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java
+++ b/sponge/src/main/java/com/griefdefender/permission/flag/GDFlagDefinition.java
@@ -149,7 +149,7 @@ public class GDFlagDefinition implements FlagDefinition {
         private boolean isAdmin = false;
         private Set<Context> contexts = new HashSet<>();
         private List<FlagData> data = new ArrayList<>();
-        private Subject subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+        private Subject subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
         private String displayName;
         private String groupName;
         private Tristate defaultValue = Tristate.UNDEFINED;
@@ -231,7 +231,7 @@ public class GDFlagDefinition implements FlagDefinition {
             this.groupName = "";
             this.defaultValue = Tristate.UNDEFINED;
             this.description = TextComponent.empty();
-            this.subject = GriefDefenderPlugin.DEFAULT_HOLDER;
+            this.subject = GriefDefenderPlugin.GD_DEFINITION_HOLDER;
             return this;
         }