diff --git a/lib/webrat/core/matchers/have_xpath.rb b/lib/webrat/core/matchers/have_xpath.rb
index 2ddad4b..c31fdd0 100644
--- a/lib/webrat/core/matchers/have_xpath.rb
+++ b/lib/webrat/core/matchers/have_xpath.rb
@@ -37,7 +37,7 @@ module Webrat
           @query = query
         end
 
-        add_options_conditions_to(@query.first)
+        add_options_conditions_to(@query)
 
         @document = Webrat.rexml_document(stringlike)
 
@@ -52,12 +52,12 @@ module Webrat
     
       def nokogiri_matches(stringlike)
         if Nokogiri::XML::NodeSet === stringlike
-          @query = query.map { |q| q.gsub(%r'//', './') }
+          @query = query.gsub(%r'//', './')
         else
           @query = query
         end
         
-        add_options_conditions_to(@query.first)
+        add_options_conditions_to(@query)
         
         @document = Webrat::XML.document(stringlike)
         @document.xpath(*@query)
@@ -88,7 +88,7 @@ module Webrat
       end
       
       def query
-        [@expected].flatten.compact
+        @expected
       end
     
       # ==== Returns