1 files changed, 14 insertions, 5 deletions
diff --git a/src/select/properties/column_span.c b/src/select/properties/column_span.c
index d17b3ed..340150f 100644
--- a/src/select/properties/column_span.c
+++ b/src/select/properties/column_span.c
@@ -51,16 +51,25 @@ css_error css__initial_column_span(css_select_state *state)
 	return set_column_span(state->computed, CSS_COLUMN_SPAN_NONE);
 }
 
+css_error css__copy_column_span(
+		const css_computed_style *from,
+		css_computed_style *to)
+{
+	if (from == to) {
+		return CSS_OK;
+	}
+
+	return set_column_span(to, get_column_span(from));
+}
+
 css_error css__compose_column_span(const css_computed_style *parent,
 		const css_computed_style *child,
 		css_computed_style *result)
 {
 	uint8_t type = get_column_span(child);
 
-	if (type == CSS_COLUMN_SPAN_INHERIT) {
-		type = get_column_span(parent);
-	}
-
-	return set_column_span(result, type);
+	return css__copy_column_span(
+			type == CSS_COLUMN_SPAN_INHERIT ? parent : child,
+			result);
 }