diff --git a/db.class.php b/db.class.php
index 760cdff..66089b0 100644
--- a/db.class.php
+++ b/db.class.php
@@ -453,14 +453,11 @@ class MeekroDB {
         $arg = $args_all[$arg_number];
         
       } else if (substr($sql, $new_pos_back, $named_seperator_length) == $this->named_param_seperator) {
-        $next_space = strpos($sql, ' ', $new_pos_back + $named_seperator_length);
-        if ($next_space < $new_pos_back + $named_seperator_length) $next_space = strlen($sql);
-        
-        $arg_number = substr($sql, $new_pos_back + $named_seperator_length, $next_space - $new_pos_back - 1); 
-        $arg_number_length = strlen($arg_number) + $named_seperator_length;
+        $arg_number_length = strspn($sql, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_', 
+          $new_pos_back + $named_seperator_length) + $named_seperator_length;
         
+        $arg_number = substr($sql, $new_pos_back + $named_seperator_length, $arg_number_length - $named_seperator_length);
         if (count($args_all) != 1) $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
-        
         if (! isset($args_all[0][$arg_number])) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
         
         $arg = $args_all[0][$arg_number];
diff --git a/simpletest/BasicTest.php b/simpletest/BasicTest.php
index b899ced..5c9879f 100644
--- a/simpletest/BasicTest.php
+++ b/simpletest/BasicTest.php
@@ -150,7 +150,7 @@ class BasicTest extends SimpleTest {
     $this->assert($row['password'] === 'blahblahblahblah');
     $this->assert($row['favorite_word'] === null);
     
-    $row = DB::query("SELECT * FROM accounts WHERE password=%s_mypass AND username=%s_myuser", 
+    $row = DB::query("SELECT * FROM accounts WHERE password=%s_mypass AND (password=%s_mypass) AND username=%s_myuser", 
       array('myuser' => 'newguy', 'mypass' => 'blahblahblahblah')
     );
     $this->assert(count($row) === 1);