diff --git a/ChangeLog b/ChangeLog
index 3da13049..cd78bf05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  1 14:50:28 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* tree.c: trying to fix a problem in namespaced attribute handling
+	  raised by Christian Glahn
+
 Thu Aug  1 12:17:30 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* encoding.c include/libxml/encoding.h: Opening the interface
diff --git a/tree.c b/tree.c
index 83bf621c..13ebe1ef 100644
--- a/tree.c
+++ b/tree.c
@@ -5261,9 +5261,7 @@ xmlUnsetNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name) {
 	return(-1);
     while (prop != NULL) {
         if ((xmlStrEqual(prop->name, name)) &&
-	    (((prop->ns == NULL) && (node->ns != NULL) &&
-	      (xmlStrEqual(node->ns->href, ns->href))) ||
-	     ((prop->ns != NULL) && (xmlStrEqual(prop->ns->href, ns->href))))) {
+	    (prop->ns != NULL) && (xmlStrEqual(prop->ns->href, ns->href))) {
 	    if (prev == NULL)
 		node->properties = prop->next;
 	    else