diff --git a/plugin.py b/plugin.py
index f4cc574..6cd2bb3 100644
--- a/plugin.py
+++ b/plugin.py
@@ -78,12 +78,12 @@ def matchHostmask (pattern,n,resolve):
     if '/' in host:
         if host.startswith('gateway/web/freenode/ip.'):
             n.ip = cache[n.prefix] = host.split('ip.')[1]
-    if n.ip != None and '@' in pattern and mcidr.match(pattern.split('@')[1]):
+    if n.ip != None and '@' in pattern and n.ip.find('*') == -1 and mcidr.match(pattern.split('@')[1]):
         address = IPAddress('%s' % n.ip)
         network = IPNetwork('%s' % pattern.split('@')[1], strict=False)
         if address in network:
             return '%s!%s@%s' % (nick,ident,n.ip)
-    elif n.ip != None and '@' in pattern and m6cidr.match(pattern.split('@')[1]):
+    elif n.ip != None and '@' in pattern and n.ip.find('*') == -1 and m6cidr.match(pattern.split('@')[1]):
         address = IPAddress('%s' % n.ip)
         network = IPNetwork('%s' % pattern.split('@')[1], strict=False)
         if address in network: