diff --git a/Terraria/NPC.cs b/Terraria/NPC.cs
index 46c9ef14..ac4df7dd 100644
--- a/Terraria/NPC.cs
+++ b/Terraria/NPC.cs
@@ -4861,17 +4861,28 @@
                 this.knockBackResist = 0.5f;
                 this.value = 250f;
             }
-            if (this.type == 0x16 && ShankShock.enableGuide == true)
+            if (this.type == 0x16)
             {
                 this.townNPC = true;
-                this.friendly = true;
-                this.name = "Guide";
+                if (ShankShock.killGuide)
+                {
+                    this.friendly = false;
+                    this.damage = 0;
+                    this.defense = 0;
+                    this.lifeMax = 1;
+                    this.name = "(Stupid) Guide";
+                }
+                else
+                {
+                    this.friendly = true;
+                    this.damage = 10;
+                    this.defense = 100;
+                    this.lifeMax = 250;
+                    this.name = "Guide";
+                }
                 this.width = 0x12;
                 this.height = 40;
                 this.aiStyle = 7;
-                this.damage = 10;
-                this.defense = 100;
-                this.lifeMax = 250;
                 this.soundHit = 1;
                 this.soundKilled = 1;
                 this.knockBackResist = 0.5f;
diff --git a/Terraria/ShankShock.cs b/Terraria/ShankShock.cs
index e84bdefd..821717fe 100644
--- a/Terraria/ShankShock.cs
+++ b/Terraria/ShankShock.cs
@@ -12,7 +12,7 @@ namespace Terraria
         private static double version = 2;
         private static bool shownVersion = false;
 
-        public static bool enableGuide = true;
+        public static bool killGuide = true;
         public static int invasionMultiplier = 1;
         public static int defaultMaxSpawns = 4;
         public static int defaultSpawnRate = 700;
@@ -260,7 +260,7 @@ namespace Terraria
             string[] configuration = config.Split(',');
             try
             {
-                enableGuide = Convert.ToBoolean(configuration[0]);
+                killGuide = Convert.ToBoolean(configuration[0]);
                 invasionMultiplier = Convert.ToInt32(configuration[1]);
                 defaultMaxSpawns = Convert.ToInt32(configuration[2]);
                 defaultSpawnRate = Convert.ToInt32(configuration[3]);