diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap
index 9c736b2..4c4daf3 100644
--- a/src/zcl_excel_writer_2007.clas.abap
+++ b/src/zcl_excel_writer_2007.clas.abap
@@ -1213,6 +1213,11 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
           lo_element_fill       TYPE REF TO if_ixml_element.
 
     CHECK iv_cell_style IS NOT INITIAL.
+
+    "Don't insert guid twice or even more
+    READ TABLE me->styles_cond_mapping TRANSPORTING NO FIELDS WITH KEY guid = iv_cell_style.
+    CHECK sy-subrc NE 0.
+
     READ TABLE me->styles_mapping INTO ls_styles_mapping WITH KEY guid = iv_cell_style.
 
     READ TABLE me->styles_cond_mapping INTO ls_style_cond_mapping WITH KEY style = ls_styles_mapping-style.
@@ -1234,24 +1239,24 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
       READ TABLE it_cellxfs INTO ls_cellxfs INDEX lv_index.
 
       "Conditional formatting font style correction by Alessandro Iannacci START
-      lv_index = ls_cellxfs-fontid + 1. " the numbering starts from 0
-      READ TABLE it_fonts INTO ls_font INDEX lv_index.
-      IF ls_font IS NOT INITIAL.
+      IF ls_cellxfs-applyfont = 1.
+        lv_index = ls_cellxfs-fontid + 1. " the numbering starts from 0
+        READ TABLE it_fonts INTO ls_font INDEX lv_index.
         lo_element_font = io_ixml_document->create_simple_element( name   = lc_xml_node_font
-                                                              parent = io_ixml_document ).
+                                                                   parent = io_ixml_document ).
         IF ls_font-bold EQ abap_true.
           lo_sub_element_2 = io_ixml_document->create_simple_element( name   = lc_xml_node_b
-                                                               parent = io_ixml_document ).
+                                                                      parent = io_ixml_document ).
           lo_element_font->append_child( new_child = lo_sub_element_2 ).
         ENDIF.
         IF ls_font-italic EQ abap_true.
           lo_sub_element_2 = io_ixml_document->create_simple_element( name   = lc_xml_node_i
-                                                               parent = io_ixml_document ).
+                                                                      parent = io_ixml_document ).
           lo_element_font->append_child( new_child = lo_sub_element_2 ).
         ENDIF.
         IF ls_font-underline EQ abap_true.
           lo_sub_element_2 = io_ixml_document->create_simple_element( name   = lc_xml_node_u
-                                                               parent = io_ixml_document ).
+                                                                      parent = io_ixml_document ).
           lv_value = ls_font-underline_mode.
           lo_sub_element_2->set_attribute_ns( name  = lc_xml_attr_val
                                             value = lv_value ).
@@ -1259,7 +1264,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
         ENDIF.
         IF ls_font-strikethrough EQ abap_true.
           lo_sub_element_2 = io_ixml_document->create_simple_element( name   = lc_xml_node_strike
-                                                               parent = io_ixml_document ).
+                                                                      parent = io_ixml_document ).
           lo_element_font->append_child( new_child = lo_sub_element_2 ).
         ENDIF.
         "color
@@ -1272,15 +1277,15 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
       "---Conditional formatting font style correction by Alessandro Iannacci END
 
 
-      lv_index = ls_cellxfs-fillid + 1. " the numbering starts from 0
-      READ TABLE it_fills INTO ls_fill INDEX lv_index.
-      IF ls_fill IS NOT INITIAL.
+      IF ls_cellxfs-applyfill = 1.
+        lv_index = ls_cellxfs-fillid + 1. " the numbering starts from 0
+        READ TABLE it_fills INTO ls_fill INDEX lv_index.
         " fill properties
         lo_element_fill = io_ixml_document->create_simple_element( name   = lc_xml_node_fill
-                                                                 parent = io_ixml_document ).
+                                                                   parent = io_ixml_document ).
         "pattern
         lo_sub_element_2 = io_ixml_document->create_simple_element( name   = lc_xml_node_patternfill
-                                                             parent = io_ixml_document ).
+                                                                    parent = io_ixml_document ).
         lv_value = ls_fill-filltype.
         lo_sub_element_2->set_attribute_ns( name  = lc_xml_attr_patterntype
                                             value = lv_value ).