diff --git a/lib/Doctrine/Tokenizer.php b/lib/Doctrine/Tokenizer.php
index 0b03c7ec9..7e1773aa6 100644
--- a/lib/Doctrine/Tokenizer.php
+++ b/lib/Doctrine/Tokenizer.php
@@ -291,11 +291,11 @@ class Doctrine_Tokenizer
                 continue;
             }
             if (empty($term[$i])) {
-                $term[$i] = trim($val);
+                $term[$i] = $val;
             } else {
-                $term[$i] .= $str[($key + 1)] . trim($val);
+                $term[$i] .= $str[($key - 1)] . $val;
             }
-            
+
             $c1 = substr_count($term[$i], $e1);
             $c2 = substr_count($term[$i], $e2);