diff --git a/src/main/java/w2phtml/xhtml/ODFPageSplitter.java b/src/main/java/w2phtml/xhtml/ODFPageSplitter.java
index 99d2fd8..68e2808 100644
--- a/src/main/java/w2phtml/xhtml/ODFPageSplitter.java
+++ b/src/main/java/w2phtml/xhtml/ODFPageSplitter.java
@@ -491,18 +491,17 @@ public class ODFPageSplitter {
 				String nodeName = tableRowChildNode.getNodeName();
 				
 				if (containsSPB(tableRowChildNode)){
-					Node tableRowGroupChildFirstPart = tableRowChildNode.cloneNode(false); 
 					if (nodeName.equals(TABLE_TABLE_CELL)){
-						if (handleCell(tableRowGroupChildFirstPart, tableRowChildNode)){
+						if (handleCell(tableRowChildNode)){
 							dataMoved = true;
-							tableRowFirstPart.appendChild(tableRowGroupChildFirstPart);
+							tableRowFirstPart.appendChild(tableRowChildNode.getPreviousSibling());
 						}
 					
 					} else if (nodeName.equals(TABLE_COVERED_TABLE_CELL)){
 						//Implement handleCoveredCell in future
-						if (handleCell(tableRowGroupChildFirstPart, tableRowChildNode)){
+						if (handleCell(tableRowChildNode)){
 							dataMoved = true;
-							tableRowFirstPart.appendChild(tableRowGroupChildFirstPart);
+							tableRowFirstPart.appendChild(tableRowChildNode.getPreviousSibling());
 						}
 					} 
 				} else {
@@ -533,7 +532,9 @@ public class ODFPageSplitter {
 		}
 		return dataMoved;
 	}
-	private static boolean handleCell(Node cellFirstPart, Node cellNode) {
+	private static boolean handleCell( Node cellNode) {
+		Node cellFirstPart = cellNode.cloneNode(false);
+		Node parent = cellNode.getParentNode();
 		boolean dataMoved = false;
 		// Node counter
 		int i = 0;
@@ -578,6 +579,10 @@ public class ODFPageSplitter {
 			}
 			
 		}
+		if (dataMoved) {
+			parent.insertBefore(cellFirstPart, cellNode);
+		}
+		
 		return dataMoved;
 	}
 	private static boolean handleSection(Node section) {