diff --git a/src/main/java/w2phtml/xhtml/content/Separator.java b/src/main/java/w2phtml/xhtml/content/Separator.java
index 58bc7bb..5b79654 100644
--- a/src/main/java/w2phtml/xhtml/content/Separator.java
+++ b/src/main/java/w2phtml/xhtml/content/Separator.java
@@ -247,7 +247,7 @@ public class Separator {
 	/**
 	 * Opens main document section heading tag
 	 */
-	public Node startDocument(Node hnode, String title, int pageNum) {
+	public Node startDocumentSeparation(Node hnode, String title, int pageNum) {
 		if (!greenstoneSeparation && !needPagination()) {
 			return hnode;
 		}
diff --git a/src/main/java/w2phtml/xhtml/content/TextParser.java b/src/main/java/w2phtml/xhtml/content/TextParser.java
index 6522cdf..5233165 100644
--- a/src/main/java/w2phtml/xhtml/content/TextParser.java
+++ b/src/main/java/w2phtml/xhtml/content/TextParser.java
@@ -1205,12 +1205,12 @@ public class TextParser extends Parser {
 		if (wasProcessedWithSection(currentNode, style)) {
 			return hnode;
 		}
-		
-		if (currentMasterPage == null && style != null) {
-		  //Document wasn't started yet. 
+		boolean firstSeparation = (currentMasterPage == null) ;
+		if (firstSeparation && style != null) {
 			hnode = startDocument(hnode, style);
-			hnode = docSep.whatToDoWithOutlineNodeOnPage(currentNode, hnode, pageNum);
-		} else if (isPageBreakFound(style)) {
+		} 
+		
+		if (isPageBreakFound(style) && !firstSeparation) {
 			 if (hasBreakBefore(style)) {
 				 
 				 if (currentNode.getNodeName() == TEXT_SECTION) {
@@ -1337,11 +1337,10 @@ public class TextParser extends Parser {
 		}
 		//Start tagging
 		String sTitle = converter.getTitle();
-		hnode = docSep.startDocument(hnode, sTitle,pageNum);
+		hnode = docSep.startDocumentSeparation(hnode, sTitle,pageNum);
 		
 		//Print header
 		addHeader(hnode);
-		//hnode = enterPageContainer(hnode);
 		return hnode;
 	}