diff --git a/include/XPath/impl/xpath_step.hpp b/include/XPath/impl/xpath_step.hpp
index cbefcec9..5550e0e9 100644
--- a/include/XPath/impl/xpath_step.hpp
+++ b/include/XPath/impl/xpath_step.hpp
@@ -489,6 +489,15 @@ public:
                                                            const ExecutionContext<string_type, string_adaptor>& executionContext) const
   {
     NodeSet<string_type, string_adaptor> ns;
+
+    NodeSet<string_type, string_adaptor> nodes = expr_->evaluate(context, executionContext).asNodeSet();
+    for(typename NodeSet<string_type, string_adaptor>::const_iterator n = nodes.begin(), ne = nodes.end(); n != ne; ++n)
+      if(context == *n)
+      {
+        ns.push_back(context);
+        break;
+      } // if ...
+
     return XPathValue<string_type, string_adaptor>(new NodeSetValue<string_type, string_adaptor>(ns));
   } // evaluate
 
diff --git a/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml b/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml
index fffeca5e..11dc8863 100644
--- a/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml
+++ b/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml
@@ -399,7 +399,10 @@
   <test-case id="Keys__91833" skip="yes" reason="uses generate-id() in output"/>
   <test-case id="Keys__91834" compare="text"/>
   <test-case id="Keys__91835" compare="text"/>
+  <test-case id="Keys__91836" skip="yes" reason="uses entities"/>
   <test-case id="Keys__91858" compare="text"/>
+  <test-case id="Keys__91859" skip="yes" reason="uses entities"/>
+  <test-case id="Keys__91860" compare="text"/>
   <test-case id="Keys_Bug76935" compare="fragment"/>
   <test-case id="Keys_PerfRepro2" compiles="no" reason="needs xsl:attribute-set"/>
   <test-case id="Keys_PerfRepro3" skip="yes" reason="Runs really slowly.  Come back to this later"/>