--- shorturl.module.orig	2010-06-16 01:20:19.000000000 -0400
+++ shorturl.module	2010-08-06 18:46:51.000000000 -0400
@@ -78,7 +78,15 @@ function shorturl_menu() {
 */
 function shorturl_shorten ($long_url, $full_url = FALSE) {
 
-  $token = _shorturl_get_token($long_url);
+  $reserved = shorturl_reserved_tokens();
+
+  foreach ($reserved as $key) {
+    $check[] = is_numeric(stripos($long_url, $key));
+  }
+
+  if (!in_array(TRUE, $check)) {
+    $token = _shorturl_get_token($long_url);
+  }
   
   if ($full_url) {
     
@@ -93,8 +101,7 @@ function shorturl_shorten ($long_url, $f
   else {
     return $token;                   
   }
-  
-  
+
 }
 
 function shorturl_default_domain() {
@@ -165,13 +172,6 @@ function _shorturl_get_token($long_url) 
 }
 
 function shorturl_check_availability($token) {
-  $reserved = shorturl_reserved_tokens();
-  
-  foreach ($reserved as $key) {
-    if (stripos($token, $key)!==FALSE) {  // contains reserved word!
-      return FALSE;
-    }
-  }
   
   $menu_handler =  menu_get_item($token);
   if (!empty($menu_handler)) { return FALSE; } // there's already a handler for this path!