diff --git a/fun.go b/fun.go
index c4191e7..117bf91 100644
--- a/fun.go
+++ b/fun.go
@@ -135,7 +135,7 @@ type Mention struct {
 	where string
 }
 
-var re_mentions = regexp.MustCompile(`@[[:alnum:]._-]+@[[:alnum:].-]+`)
+var re_mentions = regexp.MustCompile(`@[[:alnum:]._-]+@[[:alnum:].-]*[[:alnum:]]`)
 var re_urltions = regexp.MustCompile(`@https://\S+`)
 
 func grapevine(s string) []string {