diff --git a/cake/libs/set.php b/cake/libs/set.php
index f63138451..de5b6fccf 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -404,7 +404,7 @@ class Set extends Object {
 			$contexts = array($data);
 		}
 
-		$tokens = array_slice(preg_split('/(?<!=)\/(?!])/', $path), 1);
+		$tokens = array_slice(preg_split('/(?<!=)\/(?![a-z]*\])/', $path), 1);
 		do {
 			$token = array_shift($tokens);
 			$conditions = false;
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 65ddc0d4e..07a4fc4f3 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -426,8 +426,16 @@ class SetTest extends UnitTestCase {
 
 		$expected = array(1, 3);
 		$r = Set::extract('/User[name=/n/]/id', $tricky);
-		$this->assertEqual($r, $expected);	
-		
+		$this->assertEqual($r, $expected);
+
+		$expected = array(4);
+		$r = Set::extract('/User[name=/N/]/id', $tricky);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(1, 3, 4);
+		$r = Set::extract('/User[name=/N/i]/id', $tricky);
+		$this->assertEqual($r, $expected);
+
 		$common = array(	
 			array(
 				'Article' => array(