diff --git a/modules/wolfgame.py b/modules/wolfgame.py
index 55c70dc..fe26844 100644
--- a/modules/wolfgame.py
+++ b/modules/wolfgame.py
@@ -1073,7 +1073,7 @@ def goat(cli, nick, chan, rest):
     if var.PHASE != "day":
         cli.notice(nick, "You can only do that in the day.")
         return
-    if var.GOATED and nick not in var.ROLES["goat herder"]:
+    if var.GOATED and nick not in var.SPECIAL_ROLES["goat herder"]:
         cli.notice(nick, "You can only do that once per day.")
         return
     ul = list(var.USERS.keys())
@@ -2393,9 +2393,9 @@ def start(cli, nick, chann_, rest):
                 var.GUNNERS[gnr] = math.ceil(var.SHOTS_MULTIPLIER * len(pl))
     del var.ROLES["gunner"]
 
-    var.ROLES["goat herder"] = []
-    #if var.GOAT_HERDER:
-    #   var.ROLES["goat herder"] = nick
+    var.SPECIAL_ROLES["goat herder"] = []
+    if var.GOAT_HERDER:
+       var.SPECIAL_ROLES["goat herder"] = [ nick ]
 
     var.ROLES["villager"] = villagers