diff --git a/TSVbaDocxHelp.docx b/TSVbaDocxHelp.docx
index 0ad56c9..c54ac32 100644
Binary files a/TSVbaDocxHelp.docx and b/TSVbaDocxHelp.docx differ
diff --git a/demo/TSVbaDocxHelp.tsl b/demo/TSVbaDocxHelp.tsl
index e474837..ca7d1cc 100644
--- a/demo/TSVbaDocxHelp.tsl
+++ b/demo/TSVbaDocxHelp.tsl
@@ -441,7 +441,8 @@ Begin
 			if result[0][4] then rw["w"] := 1;
 			properties[result[0][1]] := rw;
 		end
-		if AnsiContainsText(line, "End;") then break;
+		if StartsText("End;", line) then break;
+		// if AnsiContainsText(line, "End;") then break;
 	end
 	for j:=i to length(lines)-1 do
 	begin
diff --git a/docx/TSDocxInlineShapes.tsf b/docx/TSDocxInlineShapes.tsf
index ef6ff2e..cb36250 100644
--- a/docx/TSDocxInlineShapes.tsf
+++ b/docx/TSDocxInlineShapes.tsf
@@ -38,6 +38,7 @@ Begin
 	docx_ := docx;
 	inline_shapes_ := array();
 	document_ := self.Parent;
+	self.SerializeInlineShapes();
 End;
 
 Function Operator TSDocxInlineShapes.[](index);
@@ -54,7 +55,7 @@ Begin
 	for i:=1 to num do
 	begin
 		paragraph := paragraphs.Item(i);
-		node := paragraph.Object();
+		node := paragraph.Object().Root();
 		if ifObj(node) then
 		begin
 			run := node.FirstChildElement("w:r");