diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
index 55621d9095..2dfaca3920 100644
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
@@ -649,8 +649,8 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
     public void setFillBackgroundColor(org.apache.poi.ss.usermodel.Color color)
     {
         if (color instanceof HSSFColor) {
-            short index2 = ((HSSFColor)color).getIndex2();
-            if (index2 != -1) setFillBackgroundColor(index2);
+            final short index = ((HSSFColor)color).getIndex();
+            if (index != -1) setFillBackgroundColor(index);
         } else if (color != null) {
             throw new IllegalArgumentException("HSSFCellStyle only accepts HSSFColor instances");
         }
@@ -708,8 +708,8 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
     public void setFillForegroundColor(org.apache.poi.ss.usermodel.Color color)
     {
         if (color instanceof HSSFColor) {
-            short index2 = ((HSSFColor)color).getIndex2();
-            if (index2 != -1) setFillForegroundColor(index2);
+            final short index = ((HSSFColor)color).getIndex();
+            if (index != -1) setFillForegroundColor(index);
         } else if (color != null) {
             throw new IllegalArgumentException("HSSFCellStyle only accepts HSSFColor instances");
         }
diff --git a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
index 43f2be2600..3f1a30ac81 100644
--- a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
@@ -398,9 +398,15 @@ public final class CellUtil {
         if (properties.containsKey(FILL_FOREGROUND_COLOR_COLOR) && properties.get(FILL_FOREGROUND_COLOR_COLOR) == null) {
             values.remove(FILL_FOREGROUND_COLOR);
         }
+        if (properties.containsKey(FILL_FOREGROUND_COLOR) && !properties.containsKey(FILL_FOREGROUND_COLOR_COLOR)) {
+            values.remove(FILL_FOREGROUND_COLOR_COLOR);
+        }
         if (properties.containsKey(FILL_BACKGROUND_COLOR_COLOR) && properties.get(FILL_BACKGROUND_COLOR_COLOR) == null) {
             values.remove(FILL_BACKGROUND_COLOR);
         }
+        if (properties.containsKey(FILL_BACKGROUND_COLOR) && !properties.containsKey(FILL_BACKGROUND_COLOR_COLOR)) {
+            values.remove(FILL_BACKGROUND_COLOR_COLOR);
+        }
         putAll(properties, values);
 
         // index seems like what index the cellstyle is in the list of styles for a workbook.