diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 0983f3d971..2504f97f6d 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -773,6 +773,10 @@ void Tabular::set_row_column_number_info()
 			if (cell_info[row][column].multicolumn
 				!= Tabular::CELL_PART_OF_MULTICOLUMN)
 				++numberofcells;
+			// Shouldn't happen after above fix - MV
+			BOOST_ASSERT(numberofcells == 0);
+			cell_info[row][column].cellno =
+				numberofcells - 1;
 		}
 	}