diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap
index aa41e25..78cce78 100644
--- a/src/zcl_excel_writer_2007.clas.abap
+++ b/src/zcl_excel_writer_2007.clas.abap
@@ -4339,7 +4339,10 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
       WHILE lv_next_row <= ls_sheet_content-cell_row.
         lv_current_row = lv_next_row.
         lv_next_row = lv_current_row + 1.
-        IF lv_current_row <> ls_sheet_content-cell_row OR
+        IF lv_current_row = ls_sheet_content-cell_row. " cell value found in this row
+          ASSIGN ls_sheet_content TO <ls_sheet_content>.
+        ENDIF.
+        IF lv_current_row <> ls_sheet_content-cell_row OR " greater doesn't occur here
            ls_sheet_content-cell_value = lc_dummy_cell_content.
 *Check if empty row is really necessary - this is basically the case when we have information in row_dimension
           lo_row_empty = io_worksheet->get_row( lv_current_row ).
@@ -4348,9 +4351,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
                 lo_row_empty->get_outline_level( io_worksheet )  > 0          OR
                 lo_row_empty->get_xf_index( )                   <> 0.
         ENDIF.
-        IF lv_current_row = ls_sheet_content-cell_row. " cell value found in this row
-          ASSIGN ls_sheet_content TO <ls_sheet_content>.
-        ELSE.
+        IF lv_current_row <> ls_sheet_content-cell_row. " greater doesn't occur here
           " Dummyentry in column A
           ls_sheet_content_empty-cell_row      = lv_current_row.
           ls_sheet_content_empty-cell_column   = 1.