diff --git a/ChangeLog b/ChangeLog
index cd9efb2d0..98d5395b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-18  Johan Gonqvist <johan.gronqvist@gmail.com>
+	* src/plugins/NarrativeWeb.py:
+	Narrative web-site plugin chrashes due to handling of notes. (#0001085)
+
 2007-07-18  Brian Matherly <brian@gramps-project.org>
             Robert Cawley <rjc@cawley.id.au>
 	* src/plugins/DetDescendantReport.py:
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index f58c0b5c0..2a827eb66 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -1975,8 +1975,7 @@ class IndividualPage(BasePage):
             of.write('<td class="data">%s</td>\n</tr>\n' % attr.get_value())
         notelist = family.get_note_list()
         for notehandle in notelist:
-            nobj = self.db.get_note_from_handle()
-            nobj = family.get_note_object()
+            nobj = self.db.get_note_from_handle(notehandle)
             if nobj:
                 text = nobj.get(markup=True)
                 format = nobj.get_format()