diff --git a/ChangeLog b/ChangeLog
index 00035098..e0d92285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 28 11:18:24 CET 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
+
+	* tree.c: Changed xmlSearchNsByHref to call xmlNsInScope with
+	  the prefix instead of the namespace name.
+	* test/schemas/annot-err_0.xsd test/schemas/element-err_0.xsd:
+	  Adapted invalid values of the "id" attribute, since they are
+	  validated now.
+
 Fri Feb 25 08:31:16 CET 2005 Daniel Veillard <daniel@veillard.com>
 
 	* threads.c: new version with fixes from Rob Richards
diff --git a/test/schemas/annot-err_0.xsd b/test/schemas/annot-err_0.xsd
index 70df4f78..94d818c4 100644
--- a/test/schemas/annot-err_0.xsd
+++ b/test/schemas/annot-err_0.xsd
@@ -4,13 +4,13 @@
 	xmlns:goo="http://GOO"
 	xmlns:but="http://BUT">
 	<xsd:element name="foo" xml:lang="hhh">
-		<xsd:annotation id="?" death="is a good entertainer" but:such="is life">
+		<xsd:annotation id="id1" death="is a good entertainer" but:such="is life">
 		    I shouldn't do this here...
-			<xsd:appinfo id="?" source="somewhere" 
+			<xsd:appinfo id="id2" source="somewhere" 
 				goo:fun="bag" fun="another fun-bag">
 				weeelll
 			</xsd:appinfo>
-			<xsd:documentation xml:lang="*" id="?" source="anywhere" 
+			<xsd:documentation xml:lang="*" id="id3" source="anywhere" 
 				goo:mothers="of invention" mothers="don't do your dishes">
 				hmmmmmm
 			</xsd:documentation>
@@ -18,4 +18,4 @@
 		</xsd:annotation>	
 	</xsd:element>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/test/schemas/element-err_0.xsd b/test/schemas/element-err_0.xsd
index a5c696fe..92604c8c 100644
--- a/test/schemas/element-err_0.xsd
+++ b/test/schemas/element-err_0.xsd
@@ -17,7 +17,7 @@
 			<xsd:sequence>
 				<xsd:element ref="foo:bar" name="myomy" minOccurs="3" 
 					maxOccurs="2" abstract="true" block="flute"
-					form="qualified" id="b12" nillable="true" 
+					form="qualified" id="b13" nillable="true" 
 					substitutionGroup="foo:bar" type="xsd:string" 
 					default="Jimi" fixed="Hendrix" final="fantasy">
 					<xsd:complexType/>
@@ -25,7 +25,7 @@
 				</xsd:element>
 				<xsd:element name="myomy" maxOccurs="0"
 					abstract="true" block="flute"
-					form="qualified" id="b12" nillable="true" 
+					form="qualified" id="b14" nillable="true" 
 					substitutionGroup="foo:bar" type="xsd:string" 
 					default="Jimi" fixed="Hendrix" final="fantasy">
 					<xsd:complexType/>
diff --git a/tree.c b/tree.c
index 91c2d4fd..7b88beb9 100644
--- a/tree.c
+++ b/tree.c
@@ -5671,7 +5671,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href)
                 if ((cur->href != NULL) && (href != NULL) &&
                     (xmlStrEqual(cur->href, href))) {
 		    if (((!is_attr) || (cur->prefix != NULL)) &&
-		        (xmlNsInScope(doc, orig, node, cur->href) == 1))
+		        (xmlNsInScope(doc, orig, node, cur->prefix) == 1))
 			return (cur);
                 }
                 cur = cur->next;
@@ -5682,7 +5682,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href)
                     if ((cur->href != NULL) && (href != NULL) &&
                         (xmlStrEqual(cur->href, href))) {
 			if (((!is_attr) || (cur->prefix != NULL)) &&
-		            (xmlNsInScope(doc, orig, node, cur->href) == 1))
+		            (xmlNsInScope(doc, orig, node, cur->prefix) == 1))
 			    return (cur);
                     }
                 }