diff --git a/ChangeLog b/ChangeLog
index 2919b2cc..739a6d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 26 11:14:56 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* error.c: Jean Fran�ois Lecomte provided a complete description
+	  and a fix to bug #53537
+
 Thu Apr 26 09:42:58 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* libxml.m4: added AM_PATH_XML2 provided by Toshio Kuratomi
diff --git a/error.c b/error.c
index 0bb3a844..4477afed 100644
--- a/error.c
+++ b/error.c
@@ -137,8 +137,13 @@ xmlParserPrintFileContext(xmlParserInputPtr input) {
 	*ctnt++ = ' ';
 	cur--;
     }
-    *(--ctnt) = '^';
-    *(++ctnt) = 0;
+    if (ctnt > content) {
+	*(--ctnt) = '^';
+	*(++ctnt) = 0;
+    } else {
+	*ctnt = '^';
+	*(++ctnt) = 0;
+    }
     xmlGenericError(xmlGenericErrorContext,"%s\n", content);
 }