diff --git a/structure/client/Resolver.js b/structure/client/Resolver.js
index a2dc71e..8c5e9c7 100644
--- a/structure/client/Resolver.js
+++ b/structure/client/Resolver.js
@@ -531,18 +531,16 @@ class Resolver {
         const resolved = [];
 
         for(const resolveable of resolveables) {
-
             const channel = CM.resolve(resolveable);
             if(channel && filter(channel)) {
                 resolved.push(channel);
                 continue;
             }
 
-            const name = /^#?([a-z0-9\-_0]*)/iu;
-            const id = /^<?#?([0-9]*)>?/iu;
+            const name = /^#?([a-z0-9\-_0]+)/iu;
+            const id = /^<?#?([0-9]{17,22})>?/iu;
 
             if (id.test(resolveable)) {
-
                 const match = resolveable.match(id);
                 const [, ch] = match;
 
@@ -551,7 +549,6 @@ class Resolver {
                 if (channel && filter(channel)) resolved.push(channel);
 
             } else if (name.test(resolveable)) {
-
                 const match = resolveable.match(name);
                 const ch = match[1].toLowerCase();