diff --git a/ChangeLog b/ChangeLog
index 54a520c2..ab0c7071 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 17 14:18:42 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* xpath.c: bug fix when context size is 0
+	* parser.c: I like Norm's Dtd because they still manage to break
+	  the parser occasionally
+
 Fri Feb 16 14:20:35 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* xpath.c: xmlXPathEqualNodeSetFloat the arg is really a double now
diff --git a/parser.c b/parser.c
index 7afee9f0..55416288 100644
--- a/parser.c
+++ b/parser.c
@@ -4221,6 +4221,8 @@ xmlParseElementDecl(xmlParserCtxtPtr ctxt) {
 	    ctxt->disableSAX = 1;
 	    return(-1);
 	}
+	while ((RAW == 0) && (ctxt->inputNr > 1))
+	    xmlPopInput(ctxt);
 	if (!IS_BLANK(CUR)) {
 	    ctxt->errNo = XML_ERR_SPACE_REQUIRED;
 	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
diff --git a/xpath.c b/xpath.c
index e889b735..0786a6d0 100644
--- a/xpath.c
+++ b/xpath.c
@@ -3374,7 +3374,7 @@ xmlXPathRoot(xmlXPathParserContextPtr ctxt) {
 void
 xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     CHECK_ARITY(0);
-    if (ctxt->context->contextSize > 0) {
+    if (ctxt->context->contextSize >= 0) {
 	valuePush(ctxt, xmlXPathNewFloat((double) ctxt->context->contextSize));
 #ifdef DEBUG_EXPR
 	xmlGenericError(xmlGenericErrorContext,