diff --git a/lib/capybara/node/simple.rb b/lib/capybara/node/simple.rb
index 5049893de..a5e250698 100644
--- a/lib/capybara/node/simple.rb
+++ b/lib/capybara/node/simple.rb
@@ -130,9 +130,10 @@ def unsynchronized
         yield # simple nodes don't need to wait
       end
 
-      def all(*args)
-        query = Capybara::Query.new(*args)
-        elements = native.xpath(query.xpath).map do |node|
+    private
+
+      def resolve_query(query, exact=nil)
+        elements = native.xpath(query.xpath(exact)).map do |node|
           self.class.new(node)
         end
         Capybara::Result.new(elements, query)
diff --git a/spec/basic_node_spec.rb b/spec/basic_node_spec.rb
index 8b65ba003..0ace354de 100644
--- a/spec/basic_node_spec.rb
+++ b/spec/basic_node_spec.rb
@@ -10,7 +10,7 @@
             <p>Yes it is</p>
           </div>
 
-          <div id="footer" style="display: none">
+          <div id="footer">
             <p>c2010</p>
             <p>Jonas Nicklas</p>
             <input type="text" name="foo" value="bar"/>
@@ -20,6 +20,10 @@
             </select>
           </div>
 
+          <div id="hidden" style="display: none">
+            <p id="secret">Secret</p>
+          </div>
+
           <section>
             <div class="subsection"></div>
           </section>
@@ -56,8 +60,8 @@
     end
 
     it "allows finding only visible nodes" do
-      string.all('//p', :text => 'c2010', :visible => true).should be_empty
-      string.all('//p', :text => 'c2010', :visible => false).should have(1).element
+      string.all(:css, '#secret', :visible => true).should be_empty
+      string.all(:css, '#secret', :visible => false).should have(1).element
     end
 
     it "allows finding elements and extracting text from them" do
@@ -83,7 +87,7 @@
 
     it "allows finding elements and checking if they are visible" do
       string.find('//h1').should be_visible
-      string.find('//input').should_not be_visible
+      string.find(:css, "#secret", :visible => false).should_not be_visible
     end
   end
 end