diff --git a/jquery-emotions/jquery.emotions.js b/jquery-emotions/jquery.emotions.js
index 5603a12..78ceec4 100644
--- a/jquery-emotions/jquery.emotions.js
+++ b/jquery-emotions/jquery.emotions.js
@@ -81,15 +81,10 @@
                 var rep = $s.replacement
                     .replace(/\{eId\}/g, $s.map[pattern]);
 
-                if (pattern[0] === ';') {
-                    text = text
-                        .replace(new RegExp("(^|\\W)" + $t.quote(pattern), "g"), "$1" + rep)
-                        .replace(new RegExp("(^|\\W)" + $t.quote(encPattent), "g"), "$1" + rep);
-                } else {
-                    text = text
-                        .replace(new RegExp($t.quote(pattern), "g"), rep)
-                        .replace(new RegExp($t.quote(encPattent), "g"), rep);
-                }
+                text = text.replace(
+                    new RegExp("(^|\\s)(" + $t.quote(pattern) + "|" + $t.quote(encPattent) + ")(?=\\s|$)", "g"),
+                    "$1" + rep
+                );
             }
 
             return text;