diff --git a/ChangeLog b/ChangeLog
index 2dc6baf3..58e9e0ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 16 19:01:06 CET 2005 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: fixing bug #151694, line should always be set in the
+	  elements.
+
 Sun Jan 16 01:04:18 CET 2005 Daniel Veillard <daniel@veillard.com>
 
 	* xmlschemastypes.c: trying to fix at least the message from
diff --git a/parser.c b/parser.c
index d0210af7..d0d8d782 100644
--- a/parser.c
+++ b/parser.c
@@ -11500,8 +11500,7 @@ xmlCreateURLParserCtxt(const char *filename, int options)
 	return(NULL);
     }
 
-    if (options != 0)
-        xmlCtxtUseOptions(ctxt, options);
+    xmlCtxtUseOptions(ctxt, options);
     
     inputStream = xmlLoadExternalEntity(filename, NULL, ctxt);
     if (inputStream == NULL) {