diff --git a/clickat.php b/clickat.php
index 3700485..0fe261a 100644
--- a/clickat.php
+++ b/clickat.php
@@ -13,8 +13,8 @@ function hook_clickat_render_linklist($data)
 {
    
     foreach ($data['links'] as &$value) {
-        $value['description'] = preg_replace('/@([\w\d]+)@([\w\d_\.]+)/','<a href="https://\2/users/\1">&commat;\1</a>',$value['description']);
-        $value['description'] = preg_replace('/@([\w\d]+)/','<a href="https://twitter.com/\1">&commat;\1</a>',$value['description']);
+        $value['description'] = preg_replace('/\ @([\w\d]+)@([\w\d_\.]+)/',' <a href="https://\2/users/\1">&commat;\1</a>',$value['description']);
+        $value['description'] = preg_replace('/\ @([\w\d]+)/',' <a href="https://twitter.com/\1">&commat;\1</a>',$value['description']);
     }
     return $data;
 }