diff --git a/plugins/Seen/plugin.py b/plugins/Seen/plugin.py
index d5bc6275e..c4255b172 100644
--- a/plugins/Seen/plugin.py
+++ b/plugins/Seen/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010-2011, James Vega
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ class SeenDB(plugins.ChannelUserDB):
 
     def seenWildcard(self, channel, nick):
         nicks = ircutils.IrcSet()
-        nickRe = re.compile('.*'.join(nick.split('*')), re.I)
+        nickRe = re.compile('^%s$' % '.*'.join(nick.split('*')), re.I)
         for (searchChan, searchNick) in self.keys():
             #print 'chan: %s ... nick: %s' % (searchChan, searchNick)
             if isinstance(searchNick, int):
@@ -75,11 +75,8 @@ class SeenDB(plugins.ChannelUserDB):
                 # are keyed by nick-string
                 continue
             if ircutils.strEqual(searchChan, channel):
-                try:
-                    s = nickRe.match(searchNick).group()
-                except AttributeError:
-                    continue
-                nicks.add(s)
+                if nickRe.search(searchNick) is not None:
+                    nicks.add(searchNick)
         L = [[nick, self.seen(channel, nick)] for nick in nicks]
         def negativeTime(x):
             return -x[1][0]