diff --git a/lib/CSSStyleSheet.js b/lib/CSSStyleSheet.js
index f0e0dfc..2264e50 100644
--- a/lib/CSSStyleSheet.js
+++ b/lib/CSSStyleSheet.js
@@ -76,7 +76,21 @@ CSSOM.CSSStyleSheet.prototype.toString = function() {
 	var result = "";
 	var rules = this.cssRules;
 	for (var i=0; i<rules.length; i++) {
-		result += rules[i].cssText + "\n";
+		if (rules[i].type === 1) {
+			result += rules[i].selectorText + " {";
+			if (rules[i].style) {
+				result += rules[i].style.cssText;
+			}
+			while (i + 1 < rules.length && rules[i + 1].selectorText === rules[i].selectorText) {
+				i += 1;
+				if (rules[i].style) {
+					result += " " + rules[i].style.cssText;
+				}
+			}
+			result += "}\n";
+		} else {
+			result += rules[i].cssText + "\n";
+		}
 	}
 	return result;
 };
diff --git a/lib/parse.js b/lib/parse.js
index dc01c29..f654c90 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -275,6 +275,15 @@ CSSOM.parse = function parse(token) {
 		case ";":
 			switch (state) {
 				case "value":
+					// Hack: Start a new CSSStyleRule if a property gets redefined.
+					// Temporary workaround until https://github.com/NV/CSSOM/issues/16 gets resolved
+					if (styleRule.style.getPropertyValue(name)) {
+						styleRule.__ends = i;
+						currentScope.cssRules.push(styleRule);
+						styleRule = new CSSOM.CSSStyleRule;
+						styleRule.selectorText = currentScope.cssRules[currentScope.cssRules.length - 1].selectorText;
+						styleRule.__starts = i;
+					}
 					styleRule.style.setProperty(name, buffer.trim(), priority);
 					priority = "";
 					buffer = "";
@@ -301,6 +310,15 @@ CSSOM.parse = function parse(token) {
 		case "}":
 			switch (state) {
 				case "value":
+					// Hack: Start a new CSSStyleRule if a property gets redefined.
+					// Temporary workaround until https://github.com/NV/CSSOM/issues/16 gets resolved
+					if (styleRule.style.getPropertyValue(name)) {
+						styleRule.__ends = i;
+						currentScope.cssRules.push(styleRule);
+						styleRule = new CSSOM.CSSStyleRule;
+						styleRule.selectorText = currentScope.cssRules[currentScope.cssRules.length - 1].selectorText;
+						styleRule.__starts = i;
+					}
 					styleRule.style.setProperty(name, buffer.trim(), priority);
 					priority = "";
 					/* falls through */