diff --git a/src/@report_data/report_data.m b/src/@report_data/report_data.m
index 043de46a0c98588557e5d5167c04bfcc1c78ac0d..4f9f4a21563e23e6806b0c4da1962d691dfc8372 100644
--- a/src/@report_data/report_data.m
+++ b/src/@report_data/report_data.m
@@ -19,7 +19,6 @@ classdef report_data < handle
     % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
     properties (SetAccess = private)
         data = ''
-        tableSubSectionHeader = ''
         tableAlignRight = false
         tableRowColor = 'white'
         tableRowIndent = 0
diff --git a/src/@report_data/writeDataForTable.m b/src/@report_data/writeDataForTable.m
index 1df33dc6bcdec02367c68fd1719ddb5169912354..34723fb91e827fecb13876d22910d69383b17b6a 100644
--- a/src/@report_data/writeDataForTable.m
+++ b/src/@report_data/writeDataForTable.m
@@ -32,12 +32,6 @@ function writeDataForTable(o, fid, precision)
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 %% Validate options provided by user
-assert(ischar(o.tableSubSectionHeader), '@report_data.writeDataForTable: tableSubSectionHeader must be a string');
-if isempty(o.tableSubSectionHeader)
-    assert(~isempty(o.data) && iscell(o.data), ...
-           '@report_data.writeDataForTable: must provide data as a cell');
-end
-
 assert(ischar(o.tableRowColor), '@report_data.writeDataForTable: tableRowColor must be a string');
 assert(isint(o.tableRowIndent) && o.tableRowIndent >= 0, ...
        '@report_data.writeDataForTable: tableRowIndent must be an integer >= 0');
@@ -53,20 +47,9 @@ rounding = 10^precision;
 
 %% Write Output
 fprintf(fid, '%% Table Data (report_data)\n');
-nrows = length(o.data{1});
-ncols = length(o.data);
+[nrows, ncols] = size(o.data);
 for i = 1:nrows
-    if ~isempty(o.tableRowColor) && ~strcmpi(o.tableRowColor, 'white')
-        fprintf(fid, '\\rowcolor{%s}', o.tableRowColor);
-    else
-        fprintf(fid, '\\rowcolor{%s}', o.tableRowColor);
-    end
-    if ~isempty(o.tableSubSectionHeader)
-        fprintf(fid, '\\textbf{%s}', o.tableSubSectionHeader);
-        fprintf(fid, '%s', repmat(' &', 1, ncols-1));
-        fprintf(fid, '\\\\%%\n');
-        return
-    end
+    fprintf(fid, '\\rowcolor{%s}', o.tableRowColor);
     if o.tableAlignRight
         fprintf(fid, '\\multicolumn{1}{r}{');
     end
@@ -81,7 +64,7 @@ for i = 1:nrows
         fprintf(fid, '}');
     end
     for j = 1:ncols
-        val = o.data{j}(i);
+        val = o.data(i,j);
         if iscell(val)
             val = val{:};
         end
diff --git a/src/@report_table/addData.m b/src/@report_table/addData.m
index 9bb66c8894fc17f1b35f35dde7131b88eed09765..b17fe9915f3d5ed24efdfcca00ba24e4f4f7a76d 100644
--- a/src/@report_table/addData.m
+++ b/src/@report_table/addData.m
@@ -29,5 +29,8 @@ function o = addData(o, varargin)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-o.table_data{end+1} = report_data(varargin{:});
+if length(o.table_data) >= 1
+    error('@report_table.addData: You can only use addData once per table')
+end
+o.table_data{1} = report_data(varargin{:});
 end
\ No newline at end of file