diff --git a/MsBinaryFile/DocFile/DocumentMapping.cpp b/MsBinaryFile/DocFile/DocumentMapping.cpp
index 8d484d7077..f8745eba5b 100644
--- a/MsBinaryFile/DocFile/DocumentMapping.cpp
+++ b/MsBinaryFile/DocFile/DocumentMapping.cpp
@@ -1441,7 +1441,7 @@ namespace DocFileFormat
 					case sprmPFInnerTableCell:
 					case sprmPFInnerTtp:
 					{
-						fEndNestingLevel = ( iter->Arguments[0] == 1 && (nestingLevel == iTap_current)) ? (true) : (false);
+						fEndNestingLevel = ( iter->Arguments[0] == 1 ) ? (true) : (false);
 					}break;
 
 					case sprmOldPFInTable:
@@ -1453,6 +1453,8 @@ namespace DocFileFormat
 						break;
 				}
 			}
+			fEndNestingLevel == (nestingLevel == iTap_current) ? fEndNestingLevel : false;
+			
 			if (nestingLevel == iTap_current)
 			{ 
 				bool bPresent = false; //118854.doc
@@ -1485,7 +1487,7 @@ namespace DocFileFormat
 					}
 				}
 			}
-			if ((nestingLevel != iTap_current || fEndNestingLevel) && !mapBoundaries.empty())
+			if ((nestingLevel != iTap_current && fEndNestingLevel) && !mapBoundaries.empty())
 				break;
 	//get the next papx
 			papx = findValidPapx( fcRowEnd );
diff --git a/MsBinaryFile/DocFile/TablePropertiesMapping.cpp b/MsBinaryFile/DocFile/TablePropertiesMapping.cpp
index 0902b32c30..ce4cde1946 100644
--- a/MsBinaryFile/DocFile/TablePropertiesMapping.cpp
+++ b/MsBinaryFile/DocFile/TablePropertiesMapping.cpp
@@ -179,9 +179,8 @@ void TablePropertiesMapping::Apply(IVisitable* visited)
 			}
 		}break;
 		case sprmTCellPadding:
-		case sprmTCellPaddingDefault:
 		case sprmTCellPaddingOuter:
-		{//default cell padding (margin)
+		{//cell padding (margin)
 			unsigned char grfbrc = iter->Arguments[2];
 			short wMar = FormatUtils::BytesToInt16(iter->Arguments, 4, iter->argumentsSize);
 			std::wstring strValue = FormatUtils::IntToWideString(wMar);