diff --git a/fun.go b/fun.go
index 4fa9a1c..3caa320 100644
--- a/fun.go
+++ b/fun.go
@@ -694,13 +694,9 @@ func savingthrow(keyname string) {
 }
 
 func keymatch(keyname string, actor string) string {
-	hash := strings.IndexByte(keyname, '#')
-	if hash == -1 {
-		hash = len(keyname)
-	}
-	owner := keyname[0:hash]
-	if owner == actor {
-		return originate(actor)
+	origin := originate(actor)
+	if origin == originate(keyname) {
+		return origin
 	}
 	return ""
 }