diff --git a/lib/OpenLayers/Format/SLD/v1.js b/lib/OpenLayers/Format/SLD/v1.js
index 0780c8d163..e23a14d995 100644
--- a/lib/OpenLayers/Format/SLD/v1.js
+++ b/lib/OpenLayers/Format/SLD/v1.js
@@ -866,15 +866,10 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
                 return node;
             },
             "CssParameter": function(obj) {
-                var name = this.getCssProperty(obj.key);
-                var value = obj.symbolizer[obj.key];
-                if (obj.symbolizer.label && name === 'fill') {
-                    value = obj.symbolizer.fontColor;
-                }
                 // not handling ogc:expressions for now
                 return this.createElementNSPlus("sld:CssParameter", {
-                    attributes: {name: name},
-                    value: value
+                    attributes: {name: this.getCssProperty(obj.key)},
+                    value: obj.symbolizer[obj.key]
                 });
             },
             "TextSymbolizer": function(symbolizer) {
@@ -899,7 +894,9 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
                 // add in optional Fill
                 if(symbolizer.fontColor != null ||
                    symbolizer.fillOpacity != null) {
-                    this.writeNode("Fill", symbolizer, node);
+                    this.writeNode("Fill", {
+                        fillColor: symbolizer.fontColor
+                    }, node);
                 }
                 return node;
             },
@@ -1013,7 +1010,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
                 // GraphicFill here
                 
                 // add in CssParameters
-                if(symbolizer.fillColor || (symbolizer.label && symbolizer.fontColor)) {
+                if(symbolizer.fillColor) {
                     this.writeNode(
                         "CssParameter",
                         {symbolizer: symbolizer, key: "fillColor"},