diff --git a/server/handlers/sshd_config/handlers/completions.go b/server/handlers/sshd_config/handlers/completions.go
index 9854e43..f533daf 100644
--- a/server/handlers/sshd_config/handlers/completions.go
+++ b/server/handlers/sshd_config/handlers/completions.go
@@ -11,6 +11,8 @@ import (
 	protocol "github.com/tliron/glsp/protocol_3_16"
 )
 
+var matchOption = fields.CreateNormalizedName("Match")
+
 func GetRootCompletions(
 	d *sshdconfig.SSHDDocument,
 	parentMatchBlock *ast.SSHDMatchBlock,
@@ -77,7 +79,7 @@ func GetOptionCompletions(
 		return nil
 	}
 
-	if entry.Key.Key == "Match" {
+	if entry.Key.Key == matchOption {
 		return getMatchCompletions(
 			d,
 			cursor,
diff --git a/server/handlers/sshd_config/handlers/completions_match.go b/server/handlers/sshd_config/handlers/completions_match.go
index e716f34..e860f7e 100644
--- a/server/handlers/sshd_config/handlers/completions_match.go
+++ b/server/handlers/sshd_config/handlers/completions_match.go
@@ -5,6 +5,7 @@ import (
 	sshdconfig "config-lsp/handlers/sshd_config"
 	"config-lsp/handlers/sshd_config/fields"
 	"config-lsp/handlers/sshd_config/match-parser"
+
 	protocol "github.com/tliron/glsp/protocol_3_16"
 )