diff --git a/modules/Entertainment/Handler/Common.cs b/modules/Entertainment/Handler/Common.cs
index 8d8cd50..b5aa1e5 100644
--- a/modules/Entertainment/Handler/Common.cs
+++ b/modules/Entertainment/Handler/Common.cs
@@ -41,7 +41,7 @@ public class Common : BotEventHandler
             return;
         }
             
-        var cds = new[] { "python", "javascript" };
+        var cds = new[] { "python", "javascript", "golang" };
 
         var msg = new HtmlString().Bold("Кулдауны:").Br();
         foreach (var cd in cds)
diff --git a/modules/Entertainment/Handler/Fun/Golang.cs b/modules/Entertainment/Handler/Fun/Golang.cs
index d2b1a45..1ad0a37 100644
--- a/modules/Entertainment/Handler/Fun/Golang.cs
+++ b/modules/Entertainment/Handler/Fun/Golang.cs
@@ -13,12 +13,12 @@ public class Golang : AbstractAnimationReply
     public Golang(CoreContext db, ILogger<Golang> logger, ThreadSafeRandom rng) : base(db, logger, rng) { }
     
     protected override Regex AnimationMatch => 
-        new("golang|go|го|голанг|голенг|гошка|(\\*\\.go)",
+        new(@"((?<![\w])(го|go)(?![\\w]))|golang|голанг|голенг|гошка|(\\*\\.go)",
             RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
     protected override string GetAnimationName() => "golang";
 
     [InChat(InChat.Public)]
-    [Command("setgolang")]
+    [Command("setgolang", CommandParseMode.Both)]
     public async Task HandleSetGolang() => await HandleSetAnimation();
 
     [InChat(InChat.Public)]