diff --git a/org/document.go b/org/document.go
index 4b240b4..34fad76 100644
--- a/org/document.go
+++ b/org/document.go
@@ -255,8 +255,10 @@ func (d *Document) addFootnote(name string, definition *FootnoteDefinition) {
 }
 
 func (d *Document) addHeadline(headline *Headline) int {
-	d.Outline.last.add(&Section{Headline: headline})
+	current := &Section{Headline: headline}
+	d.Outline.last.add(current)
 	d.Outline.count++
+	d.Outline.last = current
 	return d.Outline.count
 }
 
diff --git a/org/testdata/misc.html b/org/testdata/misc.html
index a6f9657..2c7de73 100644
--- a/org/testdata/misc.html
+++ b/org/testdata/misc.html
@@ -2,7 +2,7 @@
 <ul>
 <li>
 <a href="#headline-1">issues from goorgeous (free test cases, yay!)</a>
-</li>
+<ul>
 <li>
 <a href="#headline-2">#19: Support #+HTML</a>
 </li>
@@ -41,34 +41,42 @@
 </li>
 <li>
 <a href="#headline-14">#82: Crash on empty headline</a>
-</li>
+<ul>
 <li>
 <a href="#headline-15"></a>
 </li>
+</ul>
+</li>
 <li>
 <a href="#headline-16">#84: Paragraphs that are not followed by an empty line are not parsed correctly</a>
-</li>
+<ul>
 <li>
 <a href="#headline-17">Foo</a>
 </li>
 <li>
 <a href="#headline-18">Bar</a>
 </li>
+</ul>
+</li>
 <li>
 <a href="#headline-19">#86: Multiple hyphens not converted to dashes</a>
 </li>
 <li>
 <a href="#headline-20">#87: Markup in footnotes is rendered literally</a>
 </li>
+</ul>
+</li>
 <li>
 <a href="#headline-21">issues (wrongly) filed with hugo</a>
-</li>
+<ul>
 <li>
 <a href="#headline-22">#3874 exporting images in org mode</a>
 </li>
 <li>
 <a href="#headline-23">#4006 source code blocks in org not rendered correctly</a>
 </li>
+</ul>
+</li>
 <li>
 <a href="#headline-24">Footnotes</a>
 </li>