diff --git a/containers/win32/win32_container.cpp b/containers/win32/win32_container.cpp
index d48530071..520b1ed23 100644
--- a/containers/win32/win32_container.cpp
+++ b/containers/win32/win32_container.cpp
@@ -280,20 +280,7 @@ void win32_container::draw_background( uint_ptr _hdc, const std::vector<litehtml
 
 void win32_container::set_clip( const litehtml::position& pos, const litehtml::border_radiuses& bdr_radius )
 {
-	litehtml::position clip_pos = pos;
-	litehtml::position client_pos;
-	get_client_rect(client_pos);
-	if(!valid_x)
-	{
-		clip_pos.x		= client_pos.x;
-		clip_pos.width	= client_pos.width;
-	}
-	if(!valid_y)
-	{
-		clip_pos.y		= client_pos.y;
-		clip_pos.height	= client_pos.height;
-	}
-	m_clips.push_back(clip_pos);
+	m_clips.push_back(pos);
 }
 
 void win32_container::del_clip()
diff --git a/src/style.cpp b/src/style.cpp
index 5f267bfae..5642d36c4 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -242,7 +242,7 @@ void style::add_property(string_id name, const string& val, const string& baseur
 				add_parsed_property(_border_top_width_,		width);
 				add_parsed_property(_border_bottom_width_,	width);
 			}
-			else
+			else if (web_color::is_color(token, container))
 			{
 				web_color _color = web_color::from_string(token, container);
 				property_value color(_color, important);
@@ -275,7 +275,7 @@ void style::add_property(string_id name, const string& val, const string& baseur
 				property_value width(parse_border_width(token), important);
 				add_parsed_property(_id(_s(name) + "-width"), width);
 			}
-			else
+			else if (web_color::is_color(token, container))
 			{
 				web_color color = web_color::from_string(token, container);
 				add_parsed_property(_id(_s(name) + "-color"), property_value(color, important));
@@ -338,11 +338,12 @@ void style::add_property(string_id name, const string& val, const string& baseur
 	case _border_bottom_color_:
 	case _border_left_color_:
 	case _border_right_color_:
-	{
-		web_color color = web_color::from_string(val, container);
-		add_parsed_property(name, property_value(color, important));
+		if (web_color::is_color(val, container))
+		{
+			web_color color = web_color::from_string(val, container);
+			add_parsed_property(name, property_value(color, important));
+		}
 		break;
-	}
 
 	// Parse border radius shorthand properties 
 	case _border_bottom_left_radius_:
diff --git a/test/render/css-2-invalid-color.htm b/test/render/css-2-invalid-color.htm
new file mode 100644
index 000000000..df396aafd
--- /dev/null
+++ b/test/render/css-2-invalid-color.htm
@@ -0,0 +1,11 @@
+<!-- Check if invalid color declarations are discarded. The text should be red. -->
+<!doctype html>
+<style>
+p {
+	color: red;
+	color: reddit;
+	color: 0;   /* valid in quirks mode */
+}
+</style>
+
+<p>text
\ No newline at end of file
diff --git a/test/render/css-2-invalid-color.htm.png b/test/render/css-2-invalid-color.htm.png
new file mode 100644
index 000000000..69dfe83c1
Binary files /dev/null and b/test/render/css-2-invalid-color.htm.png differ
